diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 66c27d3..3803e89 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveUser="tim" saveUserFull="Timothy Allen" saveDateTime="2022-07-15T12:32:44" projectname="Gun Run" version="3.26.0-Buenos Aires">
+<qgis saveDateTime="2022-07-27T12:30:14" saveUser="tim" saveUserFull="Timothy Allen" version="3.26.1-Buenos Aires" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,231 +21,224 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="0" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="extra_security" expanded="1" id="extra_security20170921130834191" legend_split_behavior="0" source="./extra_security.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./extra_security.shp" patch_size="0,0" id="extra_security20170921130834191" legend_exp="" name="extra_security">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="marshals_by_position" expanded="1" id="marshals_by_position20161003112326575" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="delimitedtext" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0" id="marshals_by_position20161003112326575" legend_exp="" name="marshals_by_position">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" providerKey="virtual" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" name="complete_marshal_overview">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="marshal_overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" name="marshal_overviews">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" source="./fencing.shp|layername=fencing" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="fence_groups" expanded="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" providerKey="virtual" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" patch_size="0,0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" legend_exp="" name="fence_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="timelapse" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse" providerKey="ogr" legend_exp="">
+      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-      </layer-tree-layer>
-      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1" groupLayer="">
-        <customproperties>
-          <Option/>
-        </customproperties>
-        <layer-tree-layer patch_size="-1,-1" checked="Qt::Checked" name="route_markers" expanded="1" id="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0" legend_split_behavior="0" source="Point?crs=EPSG:4326&amp;uid={ddc97530-fd24-42f8-8cbd-7e207206a3c9}" providerKey="memory" legend_exp="">
+        <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="memory" source="Point?crs=EPSG:4326&amp;uid={be6c7bcc-3484-4b97-8be7-9b015d8f692e}" patch_size="-1,-1" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" legend_exp="" name="route_markers">
           <customproperties>
             <Option type="Map">
-              <Option name="showFeatureCount" type="int" value="1"/>
-            </Option>
-          </customproperties>
-        </layer-tree-layer>
-        <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="route markers" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" legend_split_behavior="0" 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:Integer64(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={bfd732a1-6419-4425-a0bc-d04578597c79}" providerKey="memory" legend_exp="">
-          <customproperties>
-            <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option name="showFeatureCount" type="QString" value="1"/>
+              <Option value="1" type="int" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="0" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Feeding Stations" expanded="1" groupLayer="">
+    <layer-tree-layer checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " patch_size="0,0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" name="timelapse">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="water_tables" expanded="1" id="water_tables20170921142016467" legend_split_behavior="0" source="./water_tables.shp" providerKey="ogr" legend_exp="">
+    </layer-tree-layer>
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Feeding Stations">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./water_tables.shp" patch_size="0,0" id="water_tables20170921142016467" legend_exp="" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="mayor" expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_split_behavior="0" source="./mayor.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./mayor.shp" patch_size="0,0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" name="mayor">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="viplabels" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_split_behavior="0" source="./viplabels.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./viplabels.shp" patch_size="0,0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" name="viplabels">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="vipaccess" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_split_behavior="0" source="./vipaccess.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./vipaccess.shp" patch_size="0,0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" name="vipaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="golfaccess" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_split_behavior="0" source="./golfaccess.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./golfaccess.shp" patch_size="0,0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" name="golfaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./residents_access.shp|layername=residents_access" patch_size="0,0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" name="residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="osm_roads" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_split_behavior="0" source="./osm_roads.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./osm_roads.shp" patch_size="0,0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./osm_places.shp|layername=osm_places" patch_size="0,0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="data-comments" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_split_behavior="0" source="./data-comments.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./data-comments.shp" patch_size="0,0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" name="data-comments">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="start_finish_area" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_split_behavior="0" source="./start_finish_area.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./start_finish_area.shp" patch_size="0,0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" name="start_finish_area">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_split_behavior="0" source="./capetownelevation-1m.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./capetownelevation-1m.shp" patch_size="0,0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" name="capetownelevation-1m">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="Outlines" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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" providerKey="wms" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="wms" 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" patch_size="0,0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -269,53 +262,51 @@
       <item>data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12</item>
       <item>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</item>
       <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-      <item>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</item>
       <item>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</item>
       <item>golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d</item>
       <item>vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea</item>
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0</item>
+      <item>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="1" mode="1" minScale="0" maxScale="0" type="1" tolerance="10" intersection-snapping="1" scaleDependencyMode="0" unit="1" self-snapping="0">
+  <snapping-settings intersection-snapping="1" minScale="0" maxScale="0" mode="3" self-snapping="1" type="1" tolerance="10" unit="1" enabled="1" scaleDependencyMode="0">
     <individual-layer-settings>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="extra_security20170921130834191" type="2" tolerance="0" units="2"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0" type="0" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="1" minScale="0" maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" tolerance="20" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="water_tables20170921142016467" type="2" tolerance="0" units="2"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" tolerance="12" units="1"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="0" tolerance="12" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="2" type="2" tolerance="0" id="water_tables20170921142016467" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="2" type="2" tolerance="0" id="extra_security20170921130834191" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.37381723755126117</xmin>
-      <ymin>-33.92007994238203139</ymin>
-      <xmax>18.4549366430076951</xmax>
-      <ymax>-33.89185760848387474</ymax>
+      <xmin>18.39544225003047728</xmin>
+      <ymin>-33.95274430549284972</ymin>
+      <xmax>18.44804000918376374</xmax>
+      <ymax>-33.93444496624102413</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -336,166 +327,198 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Unchecked" name="Marshals" open="false">
-      <legendlayer checked="Qt::Unchecked" name="marshal_positions" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Marshals">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="marshal_positions" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="extra_security" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="extra_security" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshals_by_position" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="marshals_by_position" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="complete_marshal_overview" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="complete_marshal_overview" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshal_overviews" drawingOrder="-1" showFeatureCount="0" open="false">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="false" name="marshal_overviews" drawingOrder="-1">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Fencing and Cones" open="false">
-      <legendlayer checked="Qt::Checked" name="fencing" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Fencing and Cones">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="fencing" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="fence_groups" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="fence_groups" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0"/>
+          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Routes" open="true">
-      <legendlayer checked="Qt::Unchecked" name="timelapse" drawingOrder="-1" showFeatureCount="0" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
-        </filegroup>
-      </legendlayer>
-      <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Checked" name="route_markers" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup checked="Qt::Checked" open="true" name="Routes">
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer checked="Qt::Checked" showFeatureCount="1" open="true" name="route_markers" drawingOrder="-1">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0" visible="1"/>
-          </filegroup>
-        </legendlayer>
-        <legendlayer checked="Qt::Unchecked" name="route markers" drawingOrder="-1" showFeatureCount="1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="0"/>
+            <legendlayerfile layerid="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" name="all_routes" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="all_routes" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" name="water_tables" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="false" name="timelapse" drawingOrder="-1">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+      </filegroup>
+    </legendlayer>
+    <legendgroup checked="Qt::Unchecked" open="true" name="Feeding Stations">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="water_tables" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="0"/>
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" name="poi_labels" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="poi_labels" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="directions_to_start" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="directions_to_start" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" name="mayor" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="mayor" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="viplabels" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="viplabels" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="vipaccess" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="vipaccess" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="golfaccess" drawingOrder="-1" showFeatureCount="0" open="false">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="false" name="golfaccess" drawingOrder="-1">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access_roads" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="residents_access_roads" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="residents_access" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" name="osm_roads" drawingOrder="-1" showFeatureCount="1" open="false">
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer checked="Qt::Checked" showFeatureCount="1" open="false" name="osm_roads" drawingOrder="-1">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="osm_places" drawingOrder="-1" showFeatureCount="1" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="1" open="true" name="osm_places" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="false">
-      <legendlayer checked="Qt::Unchecked" name="data-comments" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Start and Finish pages">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="data-comments" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="start_finish_area" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="start_finish_area" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" name="capetownelevation-1m" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="1" open="true" name="capetownelevation-1m" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="Outlines" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="Outlines" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" refreshOnNotifyMessage="" type="annotation" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
+    <units>degrees</units>
+    <extent>
+      <xmin>0</xmin>
+      <ymin>0</ymin>
+      <xmax>0</xmax>
+      <ymax>0</ymax>
+    </extent>
+    <rotation>0</rotation>
+    <destinationsrs>
+      <spatialrefsys nativeFormat="Wkt">
+        <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+        <srsid>3452</srsid>
+        <srid>4326</srid>
+        <authid>EPSG:4326</authid>
+        <description>WGS 84</description>
+        <projectionacronym>longlat</projectionacronym>
+        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </destinationsrs>
+    <rendermaptile>0</rendermaptile>
+    <expressionContextScope/>
+  </mapcanvas>
+  <mapcanvas annotationsVisible="1" name="georefCanvas">
+    <units>unknown</units>
+    <extent>
+      <xmin>0</xmin>
+      <ymin>0</ymin>
+      <xmax>0</xmax>
+      <ymax>0</ymax>
+    </extent>
+    <rotation>0</rotation>
+    <rendermaptile>0</rendermaptile>
+    <expressionContextScope/>
+  </mapcanvas>
+  <main-annotation-layer legendPlaceholderImage="" autoRefreshEnabled="0" type="annotation" refreshOnNotifyEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -546,7 +569,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshTime="0" minScale="1e+08" refreshOnNotifyMessage="" maxScale="100000" type="raster" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+    <maplayer maxScale="100000" minScale="1e+08" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" type="raster" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -611,7 +634,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -622,9 +645,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -636,58 +659,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" band="1" symbology="Line" zscale="1">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -718,36 +741,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -762,9 +785,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -773,24 +796,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Value"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Value" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.5" nodataColor="" redBand="1" type="multibandcolor" alphaBand="-1" greenBand="2" blueBand="3">
+        <rasterrenderer greenBand="2" redBand="1" opacity="0.5" blueBand="3" type="multibandcolor" alphaBand="-1" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -802,13 +828,13 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation grayscaleMode="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" saturation="0" colorizeStrength="100" colorizeOn="0" invertColors="0"/>
+        <huesaturation grayscaleMode="0" saturation="0" colorizeRed="255" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" refreshOnNotifyMessage="" maxScale="0" type="raster" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+    <maplayer maxScale="0" minScale="1e+08" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" type="raster" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -873,7 +899,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -884,7 +910,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -896,58 +922,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" band="1" symbology="Line" zscale="1">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -978,36 +1004,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1022,9 +1048,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1033,24 +1059,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Undefined"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Undefined" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" nodataColor="" type="singlebandcolordata" alphaBand="-1" band="1">
+        <rasterrenderer band="1" opacity="0.75" type="singlebandcolordata" alphaBand="-1" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1062,22 +1091,22 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation grayscaleMode="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" saturation="0" colorizeStrength="100" colorizeOn="0" invertColors="0"/>
+        <huesaturation grayscaleMode="0" saturation="0" colorizeRed="255" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.94586066151139647</ymin>
+        <ymin>-33.95649000000000228</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.94586066151139647</ymin>
+        <ymin>-33.95649000000000228</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </wgs84extent>
@@ -1133,7 +1162,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1147,8 +1176,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="6" subType="0" name="length_m" type="2" typeName="integer" precision="0" expression="$length" comment=""/>
-        <field length="-1" subType="0" name="length_km" type="6" typeName="double precision" precision="0" expression="$length / 1000" comment=""/>
+        <field typeName="integer" precision="0" type="2" length="6" expression="$length" name="length_m" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="$length / 1000" name="length_km" subType="0" comment=""/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1161,58 +1190,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="RouteLen" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1243,36 +1272,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1287,44 +1316,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1347,51 +1376,52 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active Routes" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" 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="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Distance&quot; = '21KM'"/>
-            <rule symbol="2" label="10KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Distance&quot; = '10KM'"/>
-            <rule symbol="3" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Distance&quot; = '25'"/>
+          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" label="Active Routes" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas">
+            <rule filter="&quot;Source&quot; = '21KM'" symbol="1" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule filter="&quot;Source&quot; = '10KM'" symbol="2" checkstate="0" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule filter="&quot;Source&quot; = '5KM'" symbol="3" checkstate="0" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}" description="This should be disabled, since it's only for legends"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" symbol="4" checkstate="0" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="5" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1411,44 +1441,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1464,32 +1494,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@0@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@0@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1504,15 +1534,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1520,35 +1550,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1579,36 +1609,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1628,40 +1658,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1684,38 +1714,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" 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"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1735,40 +1765,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1791,47 +1821,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" 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"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1851,44 +1881,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1904,32 +1934,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1944,15 +1974,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1960,35 +1990,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2019,36 +2049,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2068,40 +2098,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2124,38 +2154,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2175,40 +2205,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2231,47 +2261,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2291,44 +2321,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2344,32 +2374,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@2@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2384,15 +2414,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2400,35 +2430,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2459,36 +2489,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2508,40 +2538,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2564,38 +2594,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2615,40 +2645,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2671,47 +2701,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2731,44 +2761,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2784,32 +2814,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@3@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@3@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="145,211,55,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="145,211,55,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -2824,15 +2854,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2840,35 +2870,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,211,55,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,211,55,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2899,36 +2929,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2948,40 +2978,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3004,38 +3034,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3055,40 +3085,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3111,58 +3141,498 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" 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>
+                    <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>
+                  </Option>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@4@0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                  <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>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@4@0@0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <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>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,72,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" 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>
+                          </Option>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,72,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <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="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,72,255,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="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" 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>
+                  </Option>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+              <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>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@4@2">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                  <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>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" 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>
+                      </Option>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+              <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>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@4@3">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                  <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>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" 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>
+                      </Option>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="5">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3193,54 +3663,112 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{b89b4717-3f7c-4d8e-9ab9-cc625678cd6b}">
-          <rule description="Active routes" active="0" key="{083f327b-ab34-44ac-8c89-87fb4a112901}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{0ba56ba6-21a8-4c4c-9148-41f946721f2a}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{4f8efdda-7a44-4a18-ab72-9bbcbcdbd62c}" description="Active routes" active="0">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="round($length / 1000, 0)" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="round($length / 1000, 0)" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                  <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="164,113,88,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="164,113,88,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3255,119 +3783,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                            <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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="km_marker()" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="1" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="km_marker()" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="3" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="1" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -3376,61 +3883,67 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -3461,9 +3974,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3471,12 +3984,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3484,15 +3997,15 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3501,8 +4014,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3511,8 +4024,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3521,8 +4034,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3531,8 +4044,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3541,8 +4054,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3551,8 +4064,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3561,18 +4074,25 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
+        <field name="Sort" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3581,48 +4101,51 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="length_m" name="" index="8"/>
-        <alias field="length_km" name="" index="9"/>
+        <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="length_m" name=""/>
+        <alias index="10" field="length_km" 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="length_m" applyOnUpdate="0" expression=""/>
-        <default field="length_km" 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="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Sort" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -3633,29 +4156,31 @@
         <constraint field="Distance" exp="" desc=""/>
         <constraint field="RouteLen" exp="" desc=""/>
         <constraint field="Source" exp="" desc=""/>
+        <constraint field="Sort" exp="" desc=""/>
         <constraint field="length_m" exp="" desc=""/>
         <constraint field="length_km" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="6" subType="0" name="length_m" type="2" typeName="integer" precision="0" expression="$length" comment=""/>
-        <field length="-1" subType="0" name="length_km" type="6" typeName="double precision" precision="0" expression="$length / 1000" comment=""/>
+        <field typeName="integer" precision="0" type="2" length="6" expression="$length" name="length_m" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="$length / 1000" name="length_km" subType="0" comment=""/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Name&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
         <columns>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="begin" type="field" width="163" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="Name" width="152"/>
+          <column hidden="0" type="field" name="descriptio" width="-1"/>
+          <column hidden="0" type="field" name="timestamp" width="-1"/>
+          <column hidden="0" type="field" name="begin" width="163"/>
+          <column hidden="0" type="field" name="end" width="-1"/>
+          <column hidden="0" type="field" name="Distance" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="RouteLen" width="-1"/>
+          <column hidden="0" type="field" name="Source" width="-1"/>
+          <column hidden="0" type="field" name="length_m" width="-1"/>
+          <column hidden="0" type="field" name="Sort" width="-1"/>
+          <column hidden="0" type="field" name="length_km" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3687,28 +4212,28 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="0"/>
-        <field name="length_m" editable="0"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
         <field reuseLastValue="0" name="Distance"/>
@@ -3727,7 +4252,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3800,58 +4325,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3882,36 +4407,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -3926,44 +4451,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -3986,54 +4511,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="183,72,75,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="183,72,75,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4064,9 +4589,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4076,7 +4601,11 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <Option/>
+        <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>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
@@ -4085,7 +4614,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="ID" configurationFlags="None">
@@ -4111,19 +4640,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" name="" index="0"/>
-        <alias field="height" name="" index="1"/>
-        <alias field="elevation" name="" index="2"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
+        <constraint field="ID" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="height" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="elevation" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" exp="" desc=""/>
@@ -4134,7 +4663,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4157,7 +4686,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Polygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Polygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -4232,58 +4761,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4314,36 +4843,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -4358,44 +4887,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -4418,38 +4947,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -4464,9 +4993,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4476,18 +5005,22 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <Option/>
+        <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>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -4513,19 +5046,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -4536,7 +5069,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4559,7 +5092,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4624,7 +5157,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4649,58 +5182,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4731,36 +5264,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -4775,44 +5308,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -4835,54 +5368,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,85,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,85,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4913,9 +5446,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4926,32 +5459,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="Name" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="Name" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -4966,113 +5499,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="LineGeometry" geometryGeneratorEnabled="0" priority="5"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -5103,9 +5639,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5113,12 +5649,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5126,7 +5662,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -5145,16 +5681,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Name" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -5164,11 +5700,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="Name" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5200,12 +5736,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5213,7 +5749,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5278,7 +5814,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5303,58 +5839,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5385,36 +5921,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -5429,44 +5965,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -5489,48 +6025,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;distance&quot; = '21KM'" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '10KM'" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '5KM'" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5550,40 +6086,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="miter"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="area"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="miter" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="area" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5606,32 +6142,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5651,44 +6187,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -5704,32 +6240,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@0@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@0@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -5744,9 +6280,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5754,35 +6290,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -5813,39 +6349,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5865,44 +6401,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -5918,32 +6454,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -5958,9 +6494,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5968,24 +6504,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6005,44 +6541,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -6058,32 +6594,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -6098,9 +6634,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6108,35 +6644,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6167,39 +6703,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6219,44 +6755,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -6272,32 +6808,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@2@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -6312,9 +6848,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6322,24 +6858,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6359,44 +6895,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -6412,32 +6948,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@2@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@2@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -6452,9 +6988,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6462,35 +6998,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="69,100,25,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="69,100,25,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6521,71 +7057,74 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6616,9 +7155,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6626,12 +7165,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6639,7 +7178,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -6653,24 +7192,24 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Distance" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -6680,11 +7219,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="id" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="Distance" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6716,30 +7255,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6747,7 +7286,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6820,58 +7359,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6902,36 +7441,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -6946,44 +7485,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7006,46 +7545,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="0.796078" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="0.796078" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="227,0,185,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="227,0,185,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7068,15 +7607,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7087,34 +7626,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="8" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7129,151 +7668,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="1" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="8" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="8"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="227,0,185,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="4" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="4" fontKerning="1" textColor="227,0,185,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7288,89 +7827,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="1" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="2" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="2" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -7379,191 +7918,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7594,9 +8136,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7604,12 +8146,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="10" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7617,15 +8159,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -7634,8 +8176,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -7644,27 +8186,27 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -7675,12 +8217,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="position" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="position" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7756,7 +8298,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Polygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Polygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7831,58 +8373,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7913,36 +8455,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -7957,44 +8499,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8017,38 +8559,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,85,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,85,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,85,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,85,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -8063,9 +8605,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8076,57 +8618,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8157,9 +8702,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8167,12 +8712,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -8180,7 +8725,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="name" configurationFlags="None">
@@ -8220,25 +8765,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="cone_len" name="" index="3"/>
-        <alias field="fence_len" name="" index="4"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="cone_len" name=""/>
+        <alias index="4" field="fence_len" name=""/>
       </aliases>
       <defaults>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="type" 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="cone_len" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -8251,14 +8796,14 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="group" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="cone_len" type="field" width="-1" hidden="0"/>
-          <column name="fence_len" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="name" width="-1"/>
+          <column hidden="0" type="field" name="group" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="cone_len" width="-1"/>
+          <column hidden="0" type="field" name="fence_len" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8290,12 +8835,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
       </editable>
       <labelOnTop>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8303,7 +8848,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8368,7 +8913,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8382,47 +8927,47 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="cone_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" subType="0" comment=""/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyAlgorithm="0" minScale="1e+08" maxScale="0" simplifyMaxScale="1" simplifyLocal="1" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" labelsEnabled="1">
+          <qgis minScale="1e+08" simplifyAlgorithm="0" maxScale="0" labelsEnabled="1" simplifyDrawingHints="1" readOnly="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingTol="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" enableorderby="0" symbollevels="1" type="RuleRenderer">
+            <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 filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
               </rules>
               <symbols>
-                <symbol name="0" type="line" alpha="1" force_rhr="0" clip_to_extent="1">
-                  <layer enabled="1" class="SimpleLine" locked="0" 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 force_rhr="0" type="line" alpha="1" clip_to_extent="1" name="0">
+                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                    <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 name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8431,64 +8976,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.8" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="0" fontLetterSpacing="0" fontWordSpacing="0" fontSize="11" useSubstitutions="0" namedStyle="Regular" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="50" fieldName="comment" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="comment" fontUnderline="0" fontStrikeout="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" fontItalic="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.8" blendMode="0" previewBkgrdColor="#ffffff" namedStyle="Regular" useSubstitutions="0" fontSize="11" textColor="0,0,0,255">
+                      <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="0.6" shapeBorderColor="255,255,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0.6" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1"/>
+                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="2" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MM" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="5" placement="4" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000"/>
+                    <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" plussign="0" wrapChar="" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" formatNumbers="0"/>
+                    <placement geometryGenerator="" offsetType="0" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" repeatDistance="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" yOffset="0" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" centroidWhole="0" dist="5" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" quadOffset="4" repeatDistanceUnits="MM" xOffset="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" placement="4" rotationAngle="0" offsetUnits="MM"/>
+                    <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="1" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="1" minFeatureSize="0" zIndex="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                            <Option name="type" type="int" value="2"/>
+                        <Option value="" type="QString" 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>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                            <Option name="type" type="int" value="2"/>
+                          <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>
                         </Option>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="12" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="round( $length, 1) || 'm'" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="round( $length, 1) || 'm'" fontUnderline="0" fontStrikeout="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" fontItalic="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" blendMode="0" previewBkgrdColor="#ffffff" namedStyle="Semibold" useSubstitutions="0" fontSize="12" textColor="0,0,0,255">
+                      <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0"/>
+                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="15" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MM" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="5" placement="2" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" displayAll="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                    <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" plussign="0" wrapChar="" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" formatNumbers="0"/>
+                    <placement geometryGenerator="" offsetType="0" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" repeatDistance="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" yOffset="0" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" centroidWhole="0" dist="1" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" quadOffset="4" repeatDistanceUnits="MM" xOffset="0" placementFlags="15" distMapUnitScale="3x:0,0,0,0,0,0" placement="2" rotationAngle="0" offsetUnits="MM"/>
+                    <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="0" minFeatureSize="0" zIndex="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                            <Option name="type" type="int" value="2"/>
+                        <Option value="" type="QString" 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>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                            <Option name="type" type="int" value="2"/>
+                          <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>
                         </Option>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8504,18 +9049,18 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" labelPlacementMethod="XHeight" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" penColor="#000000" maxScaleDenominator="1e+08" width="15" penAlpha="255">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" scaleDependency="Area" lineSizeType="MM" sizeType="MM" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" width="15" penWidth="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penAlpha="255" labelPlacementMethod="XHeight">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
                 <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" zIndex="0" placement="2" obstacle="0">
+            <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
               <properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -8603,45 +9148,45 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" name="" index="0"/>
-              <alias field="group" name="" index="1"/>
-              <alias field="comment" name="" index="2"/>
-              <alias field="moveable" name="" index="3"/>
-              <alias field="type" name="" index="4"/>
-              <alias field="name" name="" index="5"/>
-              <alias field="hidden" name="" index="6"/>
-              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
-              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
-              <alias field="fence_len" name="" index="9"/>
-              <alias field="cone_len" name="" index="10"/>
+              <alias index="0" 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 notnull_strength="0" constraints="0" field="id" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="group" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="comment" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="moveable" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="type" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="name" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="hidden" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+              <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="group" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="comment" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="moveable" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="hidden" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="fence_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="cone_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint field="id" exp="" desc=""/>
@@ -8657,27 +9202,27 @@ def my_form_open(dialog, layer, feature):
               <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-              <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-              <field length="-1" subType="0" name="cone_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+              <field typeName="double precision" precision="0" type="6" length="-1" subType="0" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
+              <field typeName="double precision" precision="0" type="6" length="-1" subType="0" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
+              <field typeName="double precision" precision="0" type="6" length="-1" subType="0" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column name="id" width="-1" type="field" hidden="0"/>
-                <column name="group" width="-1" type="field" hidden="0"/>
-                <column width="-1" type="actions" hidden="1"/>
-                <column name="comment" width="223" type="field" hidden="0"/>
-                <column name="moveable" width="-1" type="field" hidden="0"/>
-                <column name="type" width="-1" type="field" hidden="0"/>
-                <column name="name" width="414" type="field" hidden="0"/>
-                <column name="hidden" width="-1" type="field" hidden="0"/>
-                <column name="fence_len" width="-1" type="field" hidden="0"/>
-                <column name="cone_len" width="-1" type="field" hidden="0"/>
-                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
-                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
+                <column hidden="0" type="field" width="-1" name="id"/>
+                <column hidden="0" type="field" width="-1" name="group"/>
+                <column hidden="1" type="actions" width="-1"/>
+                <column hidden="0" type="field" width="223" name="comment"/>
+                <column hidden="0" type="field" width="-1" name="moveable"/>
+                <column hidden="0" type="field" width="-1" name="type"/>
+                <column hidden="0" type="field" width="414" name="name"/>
+                <column hidden="0" type="field" width="-1" name="hidden"/>
+                <column hidden="0" type="field" width="-1" name="fence_len"/>
+                <column hidden="0" type="field" width="-1" name="cone_len"/>
+                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positiony"/>
+                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positionx"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8708,32 +9253,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8750,58 +9295,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8832,36 +9377,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -8876,44 +9421,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8936,64 +9481,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="1" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
         <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)')">
-            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-            <rule symbol="3" checkstate="0" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone')" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr')" symbol="3" checkstate="0" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="4" checkstate="0" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="1;4"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="Point"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dot"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="1;4" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="Point" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dot" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9024,56 +9569,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="4;3"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="4;3" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9104,56 +9649,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9184,56 +9729,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9264,56 +9809,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9344,50 +9889,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="5" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9418,9 +9963,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9429,34 +9974,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.80000000000000004" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="11" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="comment" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="comment" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="11" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeBorderWidth="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="1" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="255,255,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="1" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.6"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.6" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9471,110 +10016,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                        <Option name="type" type="int" value="2"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="5" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="14" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1.8200000000000001" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="14" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+              <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8200000000000001" scaleMax="0" mergeLines="1" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="11" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="round( $length, 1) || 'm'" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="round( $length, 1) || 'm'" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="11" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9589,88 +10134,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="1"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="1" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="6" xOffset="0" yOffset="0" placementFlags="14" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="14" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="6"/>
+              <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -9679,57 +10224,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -9760,9 +10308,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9770,12 +10318,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9783,7 +10331,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -9851,37 +10399,37 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="comment" name="" index="2"/>
-        <alias field="moveable" name="" index="3"/>
-        <alias field="type" name="" index="4"/>
-        <alias field="name" name="" index="5"/>
-        <alias field="hidden" name="" index="6"/>
-        <alias field="fence_len" name="" index="7"/>
-        <alias field="cone_len" name="" index="8"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="fence_len" name=""/>
+        <alias index="8" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default 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="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="fence_len" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="comment" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="moveable" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="hidden" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -9895,25 +10443,25 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="cone_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" subType="0" comment=""/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="group" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="comment" type="field" width="373" hidden="0"/>
-          <column name="moveable" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="692" hidden="0"/>
-          <column name="hidden" type="field" width="-1" hidden="0"/>
-          <column name="fence_len" type="field" width="-1" hidden="0"/>
-          <column name="cone_len" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="group" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="comment" width="373"/>
+          <column hidden="0" type="field" name="moveable" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="name" width="692"/>
+          <column hidden="0" type="field" name="hidden" width="-1"/>
+          <column hidden="0" type="field" name="fence_len" width="-1"/>
+          <column hidden="0" type="field" name="cone_len" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9945,32 +10493,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9978,7 +10526,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10051,58 +10599,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10133,36 +10681,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10177,44 +10725,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10237,54 +10785,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,178,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,178,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10315,9 +10863,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10328,57 +10876,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10409,9 +10960,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10419,12 +10970,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10432,7 +10983,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -10444,13 +10995,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10459,10 +11010,10 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10494,10 +11045,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10505,7 +11056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -10578,58 +11129,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10660,36 +11211,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -10704,44 +11255,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10764,38 +11315,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="26,0,201,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="dot"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="26,0,201,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="dot" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -10810,9 +11361,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10823,57 +11374,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10904,9 +11458,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10914,18 +11468,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option value="" type="QString" 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>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10933,15 +11487,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10950,8 +11504,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10960,27 +11514,27 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10991,12 +11545,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="page" type="field" width="-1" hidden="0"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="page" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11028,14 +11582,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11043,7 +11597,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -11108,7 +11662,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11119,7 +11673,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" memoryCache="1" customPrefix="csv_" cascadedDelete="0" editable="0" targetFieldName="position" hasCustomPrefix="1" upsertOnEdit="0" dynamicForm="0">
+        <join joinLayerId="marshals_by_position20161003112326575" customPrefix="csv_" joinFieldName="position" cascadedDelete="0" editable="0" targetFieldName="position" dynamicForm="0" upsertOnEdit="0" hasCustomPrefix="1" memoryCache="1">
           <joinFieldsSubset>
             <field name="club"/>
             <field name="name"/>
@@ -11145,58 +11699,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="114,155,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="114,155,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11227,36 +11781,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -11271,44 +11825,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11331,50 +11885,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show in marshal overview" description="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule symbol="1" label="Show in marshal maps" description="Show in marshal overview" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="0" label="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" symbol="1" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="0.792157" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="0.792157" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11397,42 +11951,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="marker" alpha="0.01" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="0.01" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11455,9 +12009,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11466,34 +12020,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{3100b6d3-183a-45b5-94f5-2ae25cc59226}">
-          <rule description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="6" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="6" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -11508,121 +12062,121 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="1" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="2" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="2" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{98b8f830-3256-405e-9a42-27279b9826d4}" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{98b8f830-3256-405e-9a42-27279b9826d4}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.5" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="6" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.5" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="6" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -11637,181 +12191,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="8" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="5" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="8"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="5" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.59999999999999998" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="6" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.59999999999999998" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="6" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -11826,181 +12380,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="8" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="5" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="8"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="5" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{85065de1-e51c-4c04-9292-536cbccc7aba}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{85065de1-e51c-4c04-9292-536cbccc7aba}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="8" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -12015,149 +12569,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="10" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="10" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -12166,197 +12720,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="StringList">
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="StringList" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -12387,9 +12944,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12397,12 +12954,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12410,15 +12967,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12427,8 +12984,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12437,8 +12994,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12447,8 +13004,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12457,8 +13014,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12467,8 +13024,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12477,8 +13034,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12520,46 +13077,46 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="notes" name="" index="3"/>
-        <alias field="xyposition" name="" index="4"/>
-        <alias field="csv_club" name="" index="5"/>
-        <alias field="csv_name" name="" index="6"/>
-        <alias field="csv_captain" name="" index="7"/>
-        <alias field="csv_captain_phone" name="" index="8"/>
-        <alias field="csv_first_runner" name="" index="9"/>
-        <alias field="csv_last_runner" name="" index="10"/>
-        <alias field="csv_instructions" name="" index="11"/>
+        <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="csv_club" name=""/>
+        <alias index="6" field="csv_name" name=""/>
+        <alias index="7" field="csv_captain" name=""/>
+        <alias index="8" field="csv_captain_phone" name=""/>
+        <alias index="9" field="csv_first_runner" name=""/>
+        <alias index="10" field="csv_last_runner" name=""/>
+        <alias index="11" 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="csv_club" applyOnUpdate="0" expression=""/>
-        <default field="csv_name" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain_phone" 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="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_name" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_phone" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="xyposition" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_first_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="notes" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="xyposition" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_club" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain_phone" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_first_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_last_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_instructions" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -12579,21 +13136,21 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="position" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="notes" type="field" width="-1" hidden="0"/>
-          <column name="xyposition" type="field" width="-1" hidden="0"/>
-          <column name="csv_name" type="field" width="-1" hidden="0"/>
-          <column name="csv_club" type="field" width="-1" hidden="0"/>
-          <column name="csv_captain" type="field" width="-1" hidden="0"/>
-          <column name="csv_captain_phone" type="field" width="-1" hidden="0"/>
-          <column name="csv_first_runner" type="field" width="-1" hidden="0"/>
-          <column name="csv_last_runner" type="field" width="-1" hidden="0"/>
-          <column name="csv_instructions" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="position" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="notes" width="-1"/>
+          <column hidden="0" type="field" name="xyposition" width="-1"/>
+          <column hidden="0" type="field" name="csv_name" width="-1"/>
+          <column hidden="0" type="field" name="csv_club" width="-1"/>
+          <column hidden="0" type="field" name="csv_captain" width="-1"/>
+          <column hidden="0" type="field" name="csv_captain_phone" width="-1"/>
+          <column hidden="0" type="field" name="csv_first_runner" width="-1"/>
+          <column hidden="0" type="field" name="csv_last_runner" width="-1"/>
+          <column hidden="0" type="field" name="csv_instructions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12625,70 +13182,70 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_firstname" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="csv_surname" editable="0"/>
-        <field name="id" editable="1"/>
-        <field name="notes" editable="1"/>
-        <field name="oldpositio" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="xyposition" editable="1"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="0" name="csv_firstname"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="0" name="csv_surname"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="notes"/>
+        <field editable="1" name="oldpositio"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12739,7 +13296,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" refreshOnNotifyMessage="" geometry="No geometry" maxScale="100000" type="vector" autoRefreshEnabled="0" wkbType="NoGeometry" readOnly="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+    <maplayer maxScale="100000" minScale="1e+08" readOnly="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" type="vector" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" wkbType="NoGeometry" geometry="No geometry" autoRefreshTime="0" refreshOnNotifyMessage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12792,7 +13349,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12820,58 +13377,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="243,166,178,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="243,166,178,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12902,36 +13459,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -12946,44 +13503,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13006,9 +13563,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13017,25 +13574,28 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="first_name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13044,8 +13604,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13068,8 +13628,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13078,8 +13638,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13088,8 +13648,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13098,8 +13658,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13122,8 +13682,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13151,52 +13711,52 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" name="" index="0"/>
-        <alias field="club" name="" index="1"/>
-        <alias field="firstname" name="" index="2"/>
-        <alias field="surname" name="" index="3"/>
-        <alias field="name" name="" index="4"/>
-        <alias field="phone" name="" index="5"/>
-        <alias field="email" name="" index="6"/>
-        <alias field="captain" name="" index="7"/>
-        <alias field="captain_phone" name="" index="8"/>
-        <alias field="captain_email" name="" index="9"/>
-        <alias field="races" name="" index="10"/>
-        <alias field="first_runner" name="" index="11"/>
-        <alias field="last_runner" name="" index="12"/>
-        <alias field="instructions" name="" index="13"/>
+        <alias index="0" field="position" name=""/>
+        <alias index="1" field="club" name=""/>
+        <alias index="2" field="firstname" name=""/>
+        <alias index="3" field="surname" name=""/>
+        <alias index="4" field="name" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="captain_email" name=""/>
+        <alias index="10" field="races" name=""/>
+        <alias index="11" field="first_runner" name=""/>
+        <alias index="12" field="last_runner" name=""/>
+        <alias index="13" field="instructions" name=""/>
       </aliases>
       <defaults>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="club" applyOnUpdate="0" expression=""/>
-        <default field="firstname" applyOnUpdate="0" expression=""/>
-        <default field="surname" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="phone" applyOnUpdate="0" expression=""/>
-        <default field="email" applyOnUpdate="0" expression=""/>
-        <default field="captain" applyOnUpdate="0" expression=""/>
-        <default field="captain_phone" applyOnUpdate="0" expression=""/>
-        <default field="captain_email" applyOnUpdate="0" expression=""/>
-        <default field="races" applyOnUpdate="0" expression=""/>
-        <default field="first_runner" applyOnUpdate="0" expression=""/>
-        <default field="last_runner" applyOnUpdate="0" expression=""/>
-        <default field="instructions" applyOnUpdate="0" expression=""/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="firstname" expression="" applyOnUpdate="0"/>
+        <default field="surname" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="phone" expression="" applyOnUpdate="0"/>
+        <default field="email" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="captain_email" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="firstname" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="surname" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain_email" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
+        <constraint field="position" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="club" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="firstname" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="surname" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="phone" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="email" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain_phone" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain_email" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="races" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="instructions" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="position" exp="" desc=""/>
@@ -13218,23 +13778,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="position" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="221" hidden="0"/>
-          <column name="club" type="field" width="-1" hidden="0"/>
-          <column name="phone" type="field" width="-1" hidden="0"/>
-          <column name="email" type="field" width="-1" hidden="0"/>
-          <column name="captain" type="field" width="-1" hidden="0"/>
-          <column name="races" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="first_runner" type="field" width="-1" hidden="0"/>
-          <column name="last_runner" type="field" width="-1" hidden="0"/>
-          <column name="instructions" type="field" width="-1" hidden="0"/>
-          <column name="firstname" type="field" width="-1" hidden="0"/>
-          <column name="surname" type="field" width="-1" hidden="0"/>
-          <column name="captain_phone" type="field" width="-1" hidden="0"/>
-          <column name="captain_email" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="position" width="-1"/>
+          <column hidden="0" type="field" name="name" width="221"/>
+          <column hidden="0" type="field" name="club" width="-1"/>
+          <column hidden="0" type="field" name="phone" width="-1"/>
+          <column hidden="0" type="field" name="email" width="-1"/>
+          <column hidden="0" type="field" name="captain" width="-1"/>
+          <column hidden="0" type="field" name="races" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="first_runner" width="-1"/>
+          <column hidden="0" type="field" name="last_runner" width="-1"/>
+          <column hidden="0" type="field" name="instructions" width="-1"/>
+          <column hidden="0" type="field" name="firstname" width="-1"/>
+          <column hidden="0" type="field" name="surname" width="-1"/>
+          <column hidden="0" type="field" name="captain_phone" width="-1"/>
+          <column hidden="0" type="field" name="captain_email" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13266,42 +13826,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13309,7 +13869,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13374,7 +13934,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13399,58 +13959,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="141,90,153,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="141,90,153,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13481,36 +14041,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -13525,44 +14085,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13585,58 +14145,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13667,50 +14227,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -13741,30 +14301,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13784,33 +14344,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -13826,32 +14386,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -13866,9 +14426,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13881,57 +14441,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13962,9 +14525,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13972,12 +14535,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13985,7 +14548,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -14004,16 +14567,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -14023,11 +14586,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14059,12 +14622,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14072,7 +14635,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14137,7 +14700,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14162,58 +14725,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="232,113,141,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="232,113,141,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14244,36 +14807,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -14288,44 +14851,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14348,44 +14911,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.75" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8.5" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="name" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="name" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.75" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="8.5" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1.5" bufferDraw="1" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="0.59999999999999998" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1.5" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -14400,155 +14963,158 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option value="" type="QString" 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>
-                  <Option name="PositionX" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_x"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="PositionY" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_y"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="Size" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
                 </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="1" xOffset="0" yOffset="0" placementFlags="2" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="0.20000000000000001" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="2" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="1"/>
+          <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="0.20000000000000001" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="Size" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14579,9 +15145,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14589,12 +15155,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -14602,15 +15168,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14619,8 +15185,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14629,8 +15195,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14639,8 +15205,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14649,8 +15215,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14659,8 +15225,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14669,8 +15235,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14679,8 +15245,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14689,45 +15255,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="osm_id" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="type" name="" index="3"/>
-        <alias field="z_order" name="" index="4"/>
-        <alias field="population" name="" index="5"/>
-        <alias field="label_x" name="" index="6"/>
-        <alias field="label_y" name="" index="7"/>
-        <alias field="label_rota" name="" index="8"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="osm_id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="population" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -14744,18 +15310,18 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="osm_id" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="z_order" type="field" width="-1" hidden="0"/>
-          <column name="population" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="label_x" type="field" width="-1" hidden="0"/>
-          <column name="label_y" type="field" width="-1" hidden="0"/>
-          <column name="label_rota" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="osm_id" width="-1"/>
+          <column hidden="0" type="field" name="name" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="z_order" width="-1"/>
+          <column hidden="0" type="field" name="population" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="label_x" width="-1"/>
+          <column hidden="0" type="field" name="label_y" width="-1"/>
+          <column hidden="0" type="field" name="label_rota" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14787,26 +15353,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14814,7 +15380,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14879,7 +15445,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14904,58 +15470,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,158,23,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,158,23,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14986,36 +15552,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -15030,44 +15596,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15090,44 +15656,102 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.80000000000000004" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="7" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="7" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="0.59999999999999998" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="196,60,57,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  </Option>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="196,60,57,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                  <Option type="Map">
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -15142,195 +15766,162 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="AlwaysShow" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="always_sho"/>
-                    <Option name="type" type="int" value="2"/>
-                  </Option>
-                  <Option name="IsObstacle" type="Map">
-                    <Option name="active" type="bool" value="false"/>
-                    <Option name="expression" type="QString" value="&quot;&quot;"/>
-                    <Option name="type" type="int" value="3"/>
-                  </Option>
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
-                  </Option>
-                  <Option name="PositionX" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_x"/>
-                    <Option name="type" type="int" value="2"/>
-                  </Option>
-                  <Option name="PositionY" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_y"/>
-                    <Option name="type" type="int" value="2"/>
-                  </Option>
-                  <Option name="Priority" type="Map">
-                    <Option name="active" type="bool" value="false"/>
-                    <Option name="type" type="int" value="1"/>
-                    <Option name="val" type="QString" value=""/>
-                  </Option>
-                  <Option name="Show" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
-                    <Option name="type" type="int" value="2"/>
-                  </Option>
-                  <Option name="Size" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                    <Option name="type" type="int" value="3"/>
-                  </Option>
-                </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MapUnit" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="3" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="3" xOffset="0" yOffset="0" placementFlags="4" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="5" obstacleFactor="0.29999999999999999" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="4" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="3"/>
+          <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="0.29999999999999999" scaleMax="10000000" mergeLines="1" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="5" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="always_sho"/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="IsObstacle" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="&quot;&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="Priority" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
-                <Option name="Show" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="Size" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+          </Option>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option name="variableNames"/>
+          <Option name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15361,9 +15952,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15371,12 +15962,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15384,15 +15975,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15401,8 +15992,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15446,8 +16037,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15510,58 +16101,58 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" name="" index="0"/>
-        <alias field="name" name="" index="1"/>
-        <alias field="highway" name="" index="2"/>
-        <alias field="waterway" name="" index="3"/>
-        <alias field="aerialway" name="" index="4"/>
-        <alias field="barrier" name="" index="5"/>
-        <alias field="man_made" name="" index="6"/>
-        <alias field="z_order" name="" index="7"/>
-        <alias field="other_tags" name="" index="8"/>
-        <alias field="never_show" name="" index="9"/>
-        <alias field="label_x" name="" index="10"/>
-        <alias field="label_y" name="" index="11"/>
-        <alias field="label_rota" name="" index="12"/>
-        <alias field="always_sho" name="" index="13"/>
-        <alias field="resident_a" name="" index="14"/>
-        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0"/>
+        <constraint field="osm_id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="highway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="waterway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="aerialway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="barrier" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="man_made" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="other_tags" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="never_show" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="always_sho" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="resident_a" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" exp="" desc=""/>
@@ -15585,25 +16176,25 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;resident_a&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column name="osm_id" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="z_order" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="highway" type="field" width="-1" hidden="0"/>
-          <column name="waterway" type="field" width="-1" hidden="0"/>
-          <column name="aerialway" type="field" width="-1" hidden="0"/>
-          <column name="barrier" type="field" width="-1" hidden="0"/>
-          <column name="man_made" type="field" width="-1" hidden="0"/>
-          <column name="other_tags" type="field" width="-1" hidden="0"/>
-          <column name="never_show" type="field" width="-1" hidden="0"/>
-          <column name="label_x" type="field" width="-1" hidden="0"/>
-          <column name="label_y" type="field" width="-1" hidden="0"/>
-          <column name="label_rota" type="field" width="-1" hidden="0"/>
-          <column name="always_sho" type="field" width="-1" hidden="0"/>
-          <column name="resident_a" type="field" width="-1" hidden="0"/>
-          <column name="auxiliary_storage_labeling_show" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="osm_id" width="-1"/>
+          <column hidden="0" type="field" name="name" width="160"/>
+          <column hidden="0" type="field" name="z_order" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="highway" width="-1"/>
+          <column hidden="0" type="field" name="waterway" width="-1"/>
+          <column hidden="0" type="field" name="aerialway" width="-1"/>
+          <column hidden="0" type="field" name="barrier" width="-1"/>
+          <column hidden="0" type="field" name="man_made" width="-1"/>
+          <column hidden="0" type="field" name="other_tags" width="142"/>
+          <column hidden="0" type="field" name="never_show" width="-1"/>
+          <column hidden="0" type="field" name="label_x" width="-1"/>
+          <column hidden="0" type="field" name="label_y" width="-1"/>
+          <column hidden="0" type="field" name="label_rota" width="-1"/>
+          <column hidden="0" type="field" name="always_sho" width="-1"/>
+          <column hidden="0" type="field" name="resident_a" width="-1"/>
+          <column hidden="0" type="field" name="auxiliary_storage_labeling_show" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15635,78 +16226,95 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="aerialway"/>
+        <field reuseLastValue="0" name="always_sho"/>
+        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
+        <field reuseLastValue="0" name="barrier"/>
+        <field reuseLastValue="0" name="highway"/>
+        <field reuseLastValue="0" name="label_rota"/>
+        <field reuseLastValue="0" name="label_x"/>
+        <field reuseLastValue="0" name="label_y"/>
+        <field reuseLastValue="0" name="man_made"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="never_show"/>
+        <field reuseLastValue="0" name="osm_id"/>
+        <field reuseLastValue="0" name="other_tags"/>
+        <field reuseLastValue="0" name="resident_a"/>
+        <field reuseLastValue="0" name="waterway"/>
+        <field reuseLastValue="0" name="z_order"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
         <widget name="always_show">
@@ -15755,7 +16363,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15820,7 +16428,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15845,58 +16453,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="231,113,72,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="231,113,72,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15927,36 +16535,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -15971,44 +16579,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16031,54 +16639,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="name" type="QString" value="star"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.5"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="star" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.5" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16101,47 +16709,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,32,80,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="0,32,80,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -16163,47 +16771,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -16225,57 +16833,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/road_closure.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/road_closure.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -16297,47 +16905,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,12,254,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="255,255,255,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="0,12,254,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="255,255,255,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -16357,21 +16965,21 @@ def my_form_open(dialog, layer, feature):
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -16388,24 +16996,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -16428,10 +17036,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -16440,18 +17048,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -16468,24 +17076,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -16509,47 +17117,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="5" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="43,153,41,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="43,153,41,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -16571,15 +17179,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16588,32 +17196,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="name" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="name" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="2" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="2" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="2" shapeSizeX="1" shapeSizeY="1" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="0.80000000000000004" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="2" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="0.69999999999999996" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="1" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="2">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -16628,145 +17236,148 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option value="" type="QString" 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>
-                  <Option name="OffsetQuad" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="2"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
-                  <Option name="Size" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
                 </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="2" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="3" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="2" yOffset="3" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="10" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="3" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="2" offsetType="0" centroidInside="0" quadOffset="2" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="3" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="10" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="OffsetQuad" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="2"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="Size" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -16797,9 +17408,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16807,12 +17418,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -16820,7 +17431,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -16853,22 +17464,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="distance" name="" index="3"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -16880,13 +17491,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="name" width="-1"/>
+          <column hidden="0" type="field" name="distance" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16918,16 +17529,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16935,7 +17546,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -17008,58 +17619,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17090,36 +17701,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -17134,44 +17745,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17194,42 +17805,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="135"/>
-                <Option name="clip_mode" type="QString" value="during_render"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="coordinate_reference" type="QString" value="feature"/>
-                <Option name="distance" type="QString" value="2"/>
-                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="distance_unit" type="QString" value="MM"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="135" type="QString" name="angle"/>
+                <Option value="during_render" type="QString" name="clip_mode"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="feature" type="QString" name="coordinate_reference"/>
+                <Option value="2" type="QString" name="distance"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
+                <Option value="MM" type="QString" name="distance_unit"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -17248,48 +17859,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                   <Option type="Map">
-                    <Option name="align_dash_pattern" type="QString" value="0"/>
-                    <Option name="capstyle" type="QString" value="square"/>
-                    <Option name="customdash" type="QString" value="5;2"/>
-                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="customdash_unit" type="QString" value="MM"/>
-                    <Option name="dash_pattern_offset" type="QString" value="0"/>
-                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                    <Option name="draw_inside_polygon" type="QString" value="0"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="line_color" type="QString" value="211,134,33,255"/>
-                    <Option name="line_style" type="QString" value="solid"/>
-                    <Option name="line_width" type="QString" value="0.3"/>
-                    <Option name="line_width_unit" type="QString" value="MM"/>
-                    <Option name="offset" type="QString" value="0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="ring_filter" type="QString" value="0"/>
-                    <Option name="trim_distance_end" type="QString" value="0"/>
-                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                    <Option name="trim_distance_start" type="QString" value="0"/>
-                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                    <Option name="use_custom_dash" type="QString" value="0"/>
-                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option value="0" type="QString" name="align_dash_pattern"/>
+                    <Option value="square" type="QString" name="capstyle"/>
+                    <Option value="5;2" type="QString" name="customdash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="customdash_unit"/>
+                    <Option value="0" type="QString" name="dash_pattern_offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                    <Option value="0" type="QString" name="draw_inside_polygon"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="211,134,33,255" type="QString" name="line_color"/>
+                    <Option value="solid" type="QString" name="line_style"/>
+                    <Option value="0.3" type="QString" name="line_width"/>
+                    <Option value="MM" type="QString" name="line_width_unit"/>
+                    <Option value="0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0" type="QString" name="ring_filter"/>
+                    <Option value="0" type="QString" name="trim_distance_end"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                    <Option value="0" type="QString" name="trim_distance_start"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                    <Option value="0" type="QString" name="use_custom_dash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -17320,27 +17931,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 name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.46"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="no"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.46" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="no" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -17355,9 +17966,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17368,57 +17979,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17449,9 +18063,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17459,12 +18073,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17472,7 +18086,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="FID" configurationFlags="None">
@@ -17484,13 +18098,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" name="" index="0"/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <defaults>
-        <default field="FID" applyOnUpdate="0" expression=""/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="FID" exp_strength="0" unique_strength="0"/>
+        <constraint field="FID" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" exp="" desc=""/>
@@ -17499,11 +18113,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="431" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17535,12 +18149,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17548,7 +18162,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17613,7 +18227,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17638,58 +18252,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,207,80,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,207,80,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17720,36 +18334,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -17764,44 +18378,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17824,61 +18438,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17909,50 +18523,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="2"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="2" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -17972,40 +18586,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="1"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="1" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18028,52 +18642,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="2;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash dot dot"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="2;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash dot dot" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18104,41 +18718,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18158,46 +18772,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18220,58 +18834,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="3;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="3;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18302,41 +18916,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18356,46 +18970,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18418,58 +19032,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18500,20 +19114,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18522,32 +19136,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="9" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="times" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="times" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="9" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18562,113 +19176,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18699,9 +19316,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18709,12 +19326,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18722,7 +19339,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -18755,22 +19372,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="status" name="" index="2"/>
-        <alias field="times" name="" index="3"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="status" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="times" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -18782,13 +19399,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="202" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="status" type="field" width="-1" hidden="0"/>
-          <column name="times" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="status" width="-1"/>
+          <column hidden="0" type="field" name="times" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18820,16 +19437,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18837,25 +19454,25 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
-        <xmin>18.37564632736778236</xmin>
-        <ymin>-33.94557692503335744</ymin>
-        <xmax>18.41938719291285409</xmax>
-        <ymax>-33.90033791158612075</ymax>
+        <xmin>18.37541576228521834</xmin>
+        <ymin>-33.95567171312350752</ymin>
+        <xmax>18.42201008438910748</xmax>
+        <ymax>-33.90011331441002085</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37564632736778236</xmin>
-        <ymin>-33.94557692503335744</ymin>
-        <xmax>18.41938719291285409</xmax>
-        <ymax>-33.90033791158612075</ymax>
+        <xmin>18.37541576228521834</xmin>
+        <ymin>-33.95567171312350752</ymin>
+        <xmax>18.42201008438910748</xmax>
+        <ymax>-33.90011331441002085</ymax>
       </wgs84extent>
-      <id>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
+      <id>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>route markers</layername>
+      <layername>route_markers</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -18902,7 +19519,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18911,1652 +19528,6 @@ def my_form_open(dialog, layer, feature):
           </temporal>
         </extent>
       </resourceMetadata>
-      <provider encoding="UTF-8">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-        <map-layer-style name="timelapse">
-          <qgis simplifyAlgorithm="0" minScale="1e+08" maxScale="100000" simplifyMaxScale="1" simplifyLocal="1" simplifyDrawingHints="0" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" labelsEnabled="1">
-            <flags>
-              <Identifiable>1</Identifiable>
-              <Removable>1</Removable>
-              <Searchable>1</Searchable>
-            </flags>
-            <renderer-v2 type="nullSymbol"/>
-            <labeling type="rule-based">
-              <rules key="{2cf820d0-73b9-4746-94f0-ade0b2da8c4e}">
-                <rule description="21KM" key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" filter="&quot;Source&quot; = '21KM'">
-                  <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="7" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRadiiY="0.1" shapeSizeX="0.5" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
-                      <substitutions/>
-                    </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="3"/>
-                    <placement repeatDistance="0" quadOffset="3" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="10" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MapUnit" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="10" placement="6" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                    <dd_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PredefinedPositionOrder" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="Rotation" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="field" type="QString" value="rotation"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                        </Option>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </dd_properties>
-                  </settings>
-                </rule>
-                <rule description="10KM" key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" filter="&quot;Source&quot; = '10KM'">
-                  <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="7" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRadiiY="0.1" shapeSizeX="0.5" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
-                      <substitutions/>
-                    </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="3"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="10" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MapUnit" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="10" placement="6" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                    <dd_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PredefinedPositionOrder" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="quadrant"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                          <Option name="Rotation" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="field" type="QString" value="rotation"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                        </Option>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </dd_properties>
-                  </settings>
-                </rule>
-                <rule description="5KM" key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" filter="&quot;Source&quot; = '5KM'">
-                  <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="7" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRadiiY="0.1" shapeSizeX="0.5" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
-                      <substitutions/>
-                    </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="3"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="10" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MapUnit" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="10" placement="6" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                    <dd_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PredefinedPositionOrder" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="quadrant"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                          <Option name="Rotation" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="field" type="QString" value="rotation"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                        </Option>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </dd_properties>
-                  </settings>
-                </rule>
-              </rules>
-            </labeling>
-            <customproperties>
-              <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
-              <property key="variableNames"/>
-              <property key="variableValues"/>
-            </customproperties>
-            <blendMode>0</blendMode>
-            <featureBlendMode>0</featureBlendMode>
-            <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" labelPlacementMethod="XHeight" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" penColor="#000000" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-                <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" label="" color="#000000"/>
-              </DiagramCategory>
-            </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" zIndex="0" placement="0" obstacle="0">
-              <properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </properties>
-            </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-              <activeChecks/>
-              <checkConfiguration/>
-            </geometryOptions>
-            <fieldConfiguration>
-              <field name="Name">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="descriptio">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="timestamp">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="begin">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="end">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="Distance">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="RouteLen">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="Source">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="length_m">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="length_km">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="org_fid">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="distance">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-            </fieldConfiguration>
-            <aliases>
-              <alias field="Name" name="" index="0"/>
-              <alias field="descriptio" name="" index="1"/>
-              <alias field="timestamp" name="" index="2"/>
-              <alias field="begin" name="" index="3"/>
-              <alias field="end" name="" index="4"/>
-              <alias field="Distance" name="" index="5"/>
-              <alias field="RouteLen" name="" index="6"/>
-              <alias field="Source" name="" index="7"/>
-              <alias field="length_m" name="" index="8"/>
-              <alias field="length_km" name="" index="9"/>
-              <alias field="org_fid" name="" index="10"/>
-              <alias field="distance" name="" index="11"/>
-            </aliases>
-            <excludeAttributesWMS/>
-            <excludeAttributesWFS/>
-            <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="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=""/>
-            </defaults>
-            <constraints>
-              <constraint notnull_strength="0" constraints="0" field="Name" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="begin" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="end" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="Distance" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="Source" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="length_m" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="length_km" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="distance" exp_strength="0" unique_strength="0"/>
-            </constraints>
-            <constraintExpressions>
-              <constraint field="Name" exp="" desc=""/>
-              <constraint field="descriptio" exp="" desc=""/>
-              <constraint field="timestamp" exp="" desc=""/>
-              <constraint field="begin" exp="" desc=""/>
-              <constraint field="end" exp="" desc=""/>
-              <constraint field="Distance" exp="" desc=""/>
-              <constraint field="RouteLen" exp="" desc=""/>
-              <constraint field="Source" exp="" desc=""/>
-              <constraint field="length_m" exp="" desc=""/>
-              <constraint field="length_km" exp="" desc=""/>
-              <constraint field="org_fid" exp="" desc=""/>
-              <constraint field="distance" exp="" desc=""/>
-            </constraintExpressions>
-            <expressionfields/>
-            <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-            </attributeactions>
-            <attributetableconfig sortOrder="1" sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown">
-              <columns>
-                <column width="-1" type="actions" hidden="1"/>
-                <column name="org_fid" width="-1" type="field" hidden="0"/>
-                <column name="distance" width="-1" type="field" hidden="0"/>
-                <column name="Name" width="-1" type="field" hidden="0"/>
-                <column name="Source" width="-1" type="field" hidden="0"/>
-                <column name="RouteLen" width="-1" type="field" hidden="0"/>
-                <column name="descriptio" width="-1" type="field" hidden="0"/>
-                <column name="timestamp" width="-1" type="field" hidden="0"/>
-                <column name="begin" width="-1" type="field" hidden="0"/>
-                <column name="end" width="-1" type="field" hidden="0"/>
-                <column name="Distance" width="-1" type="field" hidden="0"/>
-                <column name="length_km" width="-1" type="field" hidden="0"/>
-                <column name="length_m" width="-1" type="field" hidden="0"/>
-              </columns>
-            </attributetableconfig>
-            <conditionalstyles>
-              <rowstyles/>
-              <fieldstyles/>
-            </conditionalstyles>
-            <editform tolerant="1"/>
-            <editforminit/>
-            <editforminitcodesource>0</editforminitcodesource>
-            <editforminitfilepath>/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map</editforminitfilepath>
-            <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-            <featformsuppress>0</featformsuppress>
-            <editorlayout>generatedlayout</editorlayout>
-            <editable>
-              <field name="Distance" editable="1"/>
-              <field name="Name" editable="1"/>
-              <field name="RouteLen" editable="1"/>
-              <field name="Source" editable="1"/>
-              <field name="begin" editable="1"/>
-              <field name="descriptio" editable="1"/>
-              <field name="distance" editable="1"/>
-              <field name="end" editable="1"/>
-              <field name="length_km" editable="1"/>
-              <field name="length_m" editable="1"/>
-              <field name="org_fid" editable="1"/>
-              <field name="quadrant" editable="1"/>
-              <field name="timestamp" editable="1"/>
-            </editable>
-            <labelOnTop>
-              <field name="Distance" labelOnTop="0"/>
-              <field name="Name" labelOnTop="0"/>
-              <field name="RouteLen" labelOnTop="0"/>
-              <field name="Source" labelOnTop="0"/>
-              <field name="begin" labelOnTop="0"/>
-              <field name="descriptio" labelOnTop="0"/>
-              <field name="distance" labelOnTop="0"/>
-              <field name="end" labelOnTop="0"/>
-              <field name="length_km" labelOnTop="0"/>
-              <field name="length_m" labelOnTop="0"/>
-              <field name="org_fid" labelOnTop="0"/>
-              <field name="quadrant" labelOnTop="0"/>
-              <field name="timestamp" labelOnTop="0"/>
-            </labelOnTop>
-            <widgets/>
-            <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-            <mapTip>Text</mapTip>
-            <layerGeometryType>0</layerGeometryType>
-          </qgis>
-        </map-layer-style>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MM"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="225,89,137,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-              <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-              <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
-              </Option>
-              <prop k="angle" v="0"/>
-              <prop k="cap_style" v="square"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="diamond"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="scale_method" v="diameter"/>
-              <prop k="size" v="3"/>
-              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="size_unit" v="MM"/>
-              <prop k="vertical_anchor_point" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
-      <labeling type="rule-based">
-        <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
-          <rule description="Active routes" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                      <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="joinstyle" v="round"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="0,0,0,255"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="1"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule description="List for legends" active="0" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule description="21KM" active="0" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'">
-              <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                  <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="210,32,39,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <prop k="offset" v="0,0"/>
-                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="offset_unit" v="MM"/>
-                        <prop k="outline_color" v="210,32,39,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule description="10KM" active="0" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'">
-              <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                  <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="103,34,144,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <prop k="offset" v="0,0"/>
-                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="offset_unit" v="MM"/>
-                        <prop k="outline_color" v="103,34,144,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule description="5KM" active="0" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'">
-              <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                  <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="145,211,55,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <prop k="offset" v="0,0"/>
-                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="offset_unit" v="MM"/>
-                        <prop k="outline_color" v="145,211,55,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
-          <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-                <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="0"/>
-                <prop k="capstyle" v="square"/>
-                <prop k="customdash" v="5;2"/>
-                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="35,35,35,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0.26"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
-        <properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="length_m" name="" index="8"/>
-        <alias field="length_km" name="" index="9"/>
-        <alias field="org_fid" name="" index="10"/>
-        <alias field="distance" name="" index="11"/>
-      </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="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=""/>
-      </defaults>
-      <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="org_fid" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="begin" type="field" width="-1" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
-      </labelOnTop>
-      <reuseLastValue/>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
-    </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
-      <extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.94550077606164962</ymin>
-        <xmax>18.42143412573762262</xmax>
-        <ymax>-33.90011331441002085</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.94550077606164962</ymin>
-        <xmax>18.42143412573762262</xmax>
-        <ymax>-33.90011331441002085</ymax>
-      </wgs84extent>
-      <id>route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
       <layerDependencies/>
@@ -20573,58 +19544,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20655,36 +19626,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -20699,44 +19670,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20759,46 +19730,104 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
-        <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
-          <rule description="Active routes" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{0ffa6f3f-6f8e-491c-81ad-015a65f39b56}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{8783c5e4-bc17-4d88-bec2-dbb83066c593}" description="Active routes">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                  <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="213,180,60,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -20813,152 +19842,131 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                            <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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="3" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" active="0" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule description="21KM" active="0" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{10fa4124-46cc-47c8-abf9-a57ba9d4b9ad}" description="List for legends" active="0">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{2b8e68ce-be16-4623-bce0-9e65634bdfd7}" description="21KM" active="0">
               <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="210,32,39,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -20973,130 +19981,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="3" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" active="0" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{a4031224-6863-4443-9d92-421bcd31ec7b}" description="10KM" active="0">
               <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="103,34,144,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -21111,130 +20119,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" active="0" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'">
+            <rule filter="&quot;Source&quot; = '5KM'" key="{d8cdafa5-1dcf-47dc-bda3-d64d1d4fd1b6}" description="5KM" active="0">
               <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="145,211,55,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -21249,98 +20257,273 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{d922a9ed-f9f3-49b7-ade9-94d817ff0cd5}" description="Trail" active="0">
+              <settings calloutType="simple">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
+                  <families/>
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                        <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>
+                        <prop k="angle" v="0"/>
+                        <prop k="cap_style" v="square"/>
+                        <prop k="color" v="133,182,111,255"/>
+                        <prop k="horizontal_anchor_point" v="1"/>
+                        <prop k="joinstyle" v="bevel"/>
+                        <prop k="name" v="circle"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="35,35,35,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="0"/>
+                        <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="scale_method" v="diameter"/>
+                        <prop k="size" v="2"/>
+                        <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="size_unit" v="MM"/>
+                        <prop k="vertical_anchor_point" v="1"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option value="" type="QString" name="name"/>
+                            <Option name="properties"/>
+                            <Option value="collection" type="QString" name="type"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                        <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>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="0,72,255,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="0,72,255,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option value="" type="QString" name="name"/>
+                            <Option name="properties"/>
+                            <Option value="collection" type="QString" name="type"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" 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>
+                      <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>
+                      <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>
+                      <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>
+                    </Option>
+                    <Option value="collection" type="QString" 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="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" 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 force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -21350,57 +20533,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+          </Option>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21431,9 +20619,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21441,12 +20629,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -21454,15 +20642,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21471,8 +20659,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21481,8 +20669,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21491,8 +20679,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21501,8 +20689,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21511,8 +20699,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21521,8 +20709,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21531,8 +20719,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21541,8 +20729,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21551,8 +20739,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21561,8 +20749,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21571,54 +20759,64 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
+        <field name="quadrant" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="length_m" name="" index="8"/>
-        <alias field="length_km" name="" index="9"/>
-        <alias field="org_fid" name="" index="10"/>
-        <alias field="distance" name="" index="11"/>
+        <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="length_m" name=""/>
+        <alias index="9" field="length_km" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
+        <alias index="12" 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="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="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="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="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="quadrant" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -21633,26 +20831,28 @@ def my_form_open(dialog, layer, feature):
         <constraint field="length_km" exp="" desc=""/>
         <constraint field="org_fid" exp="" desc=""/>
         <constraint field="distance" exp="" desc=""/>
+        <constraint field="quadrant" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="org_fid" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="begin" type="field" width="-1" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="org_fid" width="-1"/>
+          <column hidden="0" type="field" name="distance" width="-1"/>
+          <column hidden="0" type="field" name="Name" width="-1"/>
+          <column hidden="0" type="field" name="Source" width="-1"/>
+          <column hidden="0" type="field" name="RouteLen" width="-1"/>
+          <column hidden="0" type="field" name="descriptio" width="-1"/>
+          <column hidden="0" type="field" name="timestamp" width="-1"/>
+          <column hidden="0" type="field" name="begin" width="-1"/>
+          <column hidden="0" type="field" name="end" width="-1"/>
+          <column hidden="0" type="field" name="Distance" width="-1"/>
+          <column hidden="0" type="field" name="length_km" width="-1"/>
+          <column hidden="0" type="field" name="quadrant" width="-1"/>
+          <column hidden="0" type="field" name="length_m" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21684,42 +20884,56 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21792,58 +21006,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21874,36 +21088,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -21918,44 +21132,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21978,38 +21192,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -22024,9 +21238,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22037,7 +21251,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -22045,11 +21262,11 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -22075,19 +21292,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="area" name="" index="1"/>
-        <alias field="rotation" name="" index="2"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="area" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="rotation" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="area" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="rotation" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -22098,12 +21315,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="area" type="field" width="-1" hidden="0"/>
-          <column name="rotation" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="area" width="-1"/>
+          <column hidden="0" type="field" name="rotation" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22126,21 +21343,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse</datasource>
+      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000' </datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22191,7 +21408,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22216,58 +21433,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22298,36 +21515,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -22342,44 +21559,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22402,49 +21619,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
           <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="1" pass="0">
+            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22467,20 +21684,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22492,61 +21709,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="StringList">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="StringList" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -22577,9 +21797,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22587,12 +21807,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -22600,7 +21820,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
@@ -22628,8 +21848,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -22645,8 +21865,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -22655,8 +21875,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -22705,49 +21925,49 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="RouteLen" name="" index="5"/>
-        <alias field="Source" name="" index="6"/>
-        <alias field="length_m" name="" index="7"/>
-        <alias field="length_km" name="" index="8"/>
-        <alias field="org_fid" name="" index="9"/>
-        <alias field="distance" name="" index="10"/>
-        <alias field="first_runn" name="" index="11"/>
-        <alias field="last_runne" name="" index="12"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runn" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runne" exp_strength="0" unique_strength="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runn" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runne" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -22768,22 +21988,22 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column name="begin" type="field" width="179" hidden="0"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
-          <column name="org_fid" type="field" width="-1" hidden="0"/>
-          <column name="first_runn" type="field" width="-1" hidden="0"/>
-          <column name="last_runne" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="begin" width="179"/>
+          <column hidden="0" type="field" name="RouteLen" width="-1"/>
+          <column hidden="0" type="field" name="Source" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="Name" width="-1"/>
+          <column hidden="0" type="field" name="length_m" width="-1"/>
+          <column hidden="0" type="field" name="length_km" width="-1"/>
+          <column hidden="0" type="field" name="org_fid" width="-1"/>
+          <column hidden="0" type="field" name="first_runn" width="-1"/>
+          <column hidden="0" type="field" name="last_runne" width="-1"/>
+          <column hidden="0" type="field" name="descriptio" width="-1"/>
+          <column hidden="0" type="field" name="timestamp" width="-1"/>
+          <column hidden="0" type="field" name="end" width="-1"/>
+          <column hidden="0" type="field" name="distance" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22815,58 +22035,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runne" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22874,7 +22094,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22947,58 +22167,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23029,36 +22249,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -23073,44 +22293,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23133,58 +22353,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23215,50 +22435,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -23289,30 +22509,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -23332,33 +22552,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -23374,32 +22594,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -23414,9 +22634,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -23429,57 +22649,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23510,9 +22733,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23520,12 +22743,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -23533,7 +22756,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -23552,16 +22775,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -23571,11 +22794,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23607,12 +22830,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -23620,7 +22843,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -23693,58 +22916,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23775,36 +22998,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -23819,44 +23042,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23879,44 +23102,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="15" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="label" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="label" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="15" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -23931,112 +23154,115 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24067,9 +23293,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24077,12 +23303,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -24090,7 +23316,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -24109,16 +23335,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="label" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -24128,11 +23354,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="label" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="label" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24164,12 +23390,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24177,7 +23403,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -24242,7 +23468,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24267,58 +23493,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -24349,36 +23575,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -24393,44 +23619,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24453,46 +23679,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="31,120,180,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Bold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="75" fieldName="label" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="label" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="75" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Bold" useSubstitutions="0" fontSize="8" fontKerning="1" textColor="31,120,180,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="0.75" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0.5" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeRadiiY="0.5" shapeSizeX="0.75" shapeSizeY="0.29999999999999999" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeBorderColor="31,120,206,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="0.40000000000000002" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="0.75" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.75" shapeOpacity="0.59999999999999998" shapeBorderColor="31,120,206,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.29999999999999999" shapeOffsetY="-0.14999999999999999" shapeRotation="0" shapeBorderWidth="0.75" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0.5">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,204"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.75"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,204" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.75" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -24507,56 +23733,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="1" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="1" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="1" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="0.76000000000000001" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="6" upsidedownLabels="0" zIndex="5" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="1" offsetType="0" centroidInside="0" quadOffset="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="0.76000000000000001" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="5" drawLabels="1" obstacleType="0" maxNumLabels="6" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -24565,57 +23791,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24646,9 +23875,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24656,12 +23885,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -24669,15 +23898,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24686,8 +23915,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24696,8 +23925,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24711,22 +23940,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="table_set" name="" index="1"/>
-        <alias field="label" name="" index="2"/>
-        <alias field="races" name="" index="3"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" 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="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="table_set" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="races" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -24738,13 +23967,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="table_set" type="field" width="-1" hidden="0"/>
-          <column name="label" type="field" width="-1" hidden="0"/>
-          <column name="races" type="field" width="130" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="table_set" width="-1"/>
+          <column hidden="0" type="field" name="label" width="-1"/>
+          <column hidden="0" type="field" name="races" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24776,16 +24005,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24813,14 +24042,13 @@ def my_form_open(dialog, layer, feature):
     <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
     <layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
     <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-    <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
     <layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
     <layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
     <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0"/>
+    <layer id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -25002,7 +24230,7 @@ def my_form_open(dialog, layer, feature):
       <parameters type="QString">KGxwMApJMDAKYUkxCmFJNQphSTAxCmFGMS4wCmFJMDAKYU5hTmEobHAxCmFOYUkyCmFJMAphTmFOYS4=</parameters>
     </Mask>
     <Measure>
-      <Ellipsoid type="QString">WGS84</Ellipsoid>
+      <Ellipsoid type="QString">NONE</Ellipsoid>
     </Measure>
     <Measurement>
       <AreaUnits type="QString">&lt;unknown></AreaUnits>
@@ -25030,9 +24258,11 @@ def my_form_open(dialog, layer, feature):
     </Paths>
     <PositionPrecision>
       <Automatic type="bool">true</Automatic>
+      <CoordinateOrder type="QString">Default</CoordinateOrder>
       <DecimalPlaces type="int">2</DecimalPlaces>
       <DegreeFormat type="QString">MU</DegreeFormat>
     </PositionPrecision>
+    <RenderMapTile type="bool">false</RenderMapTile>
     <RequiredLayers>
       <Layers type="QStringList">
         <value>water_tables20170921142016467</value>
@@ -25094,6 +24324,7 @@ def my_form_open(dialog, layer, feature):
     <WMSContactPhone type="QString"></WMSContactPhone>
     <WMSContactPosition type="QString"></WMSContactPosition>
     <WMSDefaultMapUnitsPerMm type="double">0</WMSDefaultMapUnitsPerMm>
+    <WMSFeatureInfoUseAttributeFormSettings type="bool">false</WMSFeatureInfoUseAttributeFormSettings>
     <WMSFees type="QString">conditions unknown</WMSFees>
     <WMSImageQuality type="int">90</WMSImageQuality>
     <WMSKeywordList type="QStringList">
@@ -25132,156 +24363,165 @@ def my_form_open(dialog, layer, feature):
       <Project type="bool">false</Project>
     </WMTSPngLayers>
     <WMTSUrl type="QString"></WMTSUrl>
+    <qfieldsync>
+      <areaOfInterest type="QString"></areaOfInterest>
+      <areaOfInterestCrs type="QString"></areaOfInterestCrs>
+      <baseMapMupp type="double">10</baseMapMupp>
+      <baseMapTheme type="QString"></baseMapTheme>
+      <baseMapTileSize type="int">1024</baseMapTileSize>
+      <baseMapType type="QString">singleLayer</baseMapType>
+      <createBaseMap type="int">0</createBaseMap>
+      <digitizingLogsLayer type="QString"></digitizingLogsLayer>
+      <layerActionPreference type="QString">online</layerActionPreference>
+      <maximumImageWidthHeight type="int">0</maximumImageWidthHeight>
+      <offlineCopyOnlyAoi type="int">0</offlineCopyOnlyAoi>
+    </qfieldsync>
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option name="name" type="QString" value=""/>
+      <Option value="" type="QString" name="name"/>
       <Option name="properties"/>
-      <Option name="type" type="QString" value="collection"/>
+      <Option value="collection" type="QString" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" visible="1"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="All Routes">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" visible="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" visible="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer expanded="1" visible="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Fencing">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer expanded="1" visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-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="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer expanded="1" visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
@@ -25289,27 +24529,25 @@ def my_form_open(dialog, layer, feature):
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal overview">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
@@ -25317,89 +24555,110 @@ def my_form_open(dialog, layer, feature):
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Proposed Routes">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
+      <layer expanded="1" visible="0" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" visible="1" style="default" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+      <expanded-legend-nodes id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <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" visible="0" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="0" style="default" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer expanded="1" visible="0" style="default" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+      </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -25427,31 +24686,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Routes" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Routes" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -25466,49 +24725,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -25523,59 +24782,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="9.44946,191.611,mm" outlineWidthM="0.3,mm" labelText="[%&quot;Distance&quot;%]" position="9.44946,191.611,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" blendMode="0" htmlState="0" type="65641" size="14.1764,7.471,mm" halign="1" valign="64" frame="false" zValue="9">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="14.1764,7.471,mm" positionLock="true" background="false" itemRotation="0" zValue="9" marginX="1" groupUuid="" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="[%&quot;Distance&quot;%]" positionOnPage="9.44946,191.611,mm" outlineWidthM="0.3,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25590,65 +24849,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="0" positionLock="true" id="" positionOnPage="24.2445,191.81,mm" outlineWidthM="0.3,mm" labelText="RACE ROUTE" position="24.2445,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" blendMode="0" htmlState="0" type="65641" size="29.2025,7.272,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="29.2025,7.272,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="0" groupUuid="" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="RACE ROUTE" positionOnPage="24.2445,191.81,mm" outlineWidthM="0.3,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25663,65 +24922,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="204.225,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" blendMode="0" htmlState="0" type="65641" size="57.4836,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="57.4836,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25736,65 +24995,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 September 2020" position="210.038,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 September 2020" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25809,39 +25068,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25849,42 +25108,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.959,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.959,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="3" groupUuid="" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -25899,61 +25158,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" blendMode="0" followPreset="true" type="65639" size="67.7828,166.874,mm" frame="true" isTemporal="0" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="67.7828,166.874,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="2" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Routes" positionOnPage="5.86559,4.09761,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -25968,45 +25227,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26037,44 +25296,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26097,40 +25356,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26145,29 +25404,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26175,45 +25434,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" blendMode="0" followPreset="true" type="65639" size="282.012,175.592,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="282.012,174.44,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="Routes" positionOnPage="9.44946,9.08557,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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 '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41993447095743619" ymin="-33.91199999999999903" xmin="18.39750000000000085" ymax="-33.89803136713971554"/>
+        <Extent ymax="-33.89812294355778732" xmin="18.39750000000000085" xmax="18.4199345745815819" ymin="-33.91199999999999903"/>
         <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>
@@ -26228,45 +25487,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26297,44 +25556,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26357,40 +25616,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26405,29 +25664,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26435,62 +25694,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="QString" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfOgcBestPracticeFormat" type="QString" value="0"/>
-          <Option name="pdfSimplify" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="QString" name="pdfAppendGeoreference"/>
+          <Option value="0" type="QString" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="QString" name="pdfSimplify"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="1" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="0" coverageLayerName="all_routes" sortKey="length_m"/>
+      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" sortFeatures="1" sortKey="&quot;Sort&quot;" filterFeatures="1" enabled="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshals" printResolution="120" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Marshals" printResolution="120">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -26505,49 +25764,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -26562,9 +25821,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26572,15 +25831,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="5" positionOnPage="110.353,5.04491,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.1,mm" frameJoinStyle="bevel" excludeFromExports="0" size="39.4344,45.9,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="110.353,5.04491,mm" wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" type="65642" positionLock="true" symbolHeight="4" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="128" alpha="255" red="128" blue="128"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="bevel" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="1" boxSpace="2" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" positionOnPage="110.353,5.04491,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.1,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="39.4312,46.1,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" zValue="5" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" position="110.353,5.04491,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="128" green="128" blue="128"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26588,48 +25847,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="1" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" source="./fencing.shp|layername=fencing" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/node-order" type="QString" value="0,1,2"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="0,1,2" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -26637,62 +25896,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal map - inset" labelMargin="0,mm" mapFlags="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="98.7828,149.027,mm" outlineWidthM="0.2,mm" position="98.7828,149.027,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" blendMode="0" followPreset="true" type="65639" size="56.5192,54.5647,mm" frame="true" isTemporal="0" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="56.5192,54.5647,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="4" groupUuid="" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal map - inset" positionOnPage="98.7828,149.027,mm" isTemporal="0" outlineWidthM="0.2,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41493455420295433" ymin="-33.90316824413850583" xmin="18.41064302246786966" ymax="-33.89902512102636223"/>
+        <Extent ymax="-33.89902512102636223" xmin="18.41064302246786966" xmax="18.41493455420295433" ymin="-33.90316824413850583"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26723,44 +25982,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26783,40 +26042,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26831,29 +26090,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26861,28 +26120,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" inverted="0" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1">
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" blendMode="0" centered="1" show="1" inverted="0" name="Overview 1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,65,170,127"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,102"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,65,170,127" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,102" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -26897,9 +26156,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26907,9 +26166,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26917,69 +26176,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal map - main" labelMargin="0,mm" mapFlags="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="3.53,6.0007,mm" outlineWidthM="0.3,mm" position="3.53,6.0007,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="false" mapRotation="0" referencePoint="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" followPreset="true" type="65639" size="142,187.018,mm" frame="false" isTemporal="0" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="142,187.018,mm" positionLock="true" background="false" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="3" groupUuid="" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal map - main" positionOnPage="3.53,6.0007,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41330222336237554" ymin="-33.9017728906146445" xmin="18.41227535330844844" ymax="-33.90042047455022356"/>
+        <Extent ymax="-33.90042047455022356" xmin="18.41227535330844844" xmax="18.41330222336237554" ymin="-33.9017728906146445"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27010,44 +26269,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -27070,40 +26329,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27118,29 +26377,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27148,22 +26407,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" sectionX="0" hideBackgroundIfEmpty="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" opacity="1" sectionWidth="142.117" itemRotation="0" groupUuid="" sectionHeight="182.4" positionLock="true" id="" positionOnPage="290.617,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hidePageIfEmpty="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" outlineWidthM="0.3,mm" position="290.617,6.0007,mm" frameJoinStyle="round" excludeFromExports="0" background="false" referencePoint="2" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" blendMode="0" type="65647" size="142.117,187.018,mm" frame="false" zValue="2" sectionY="0">
-        <FrameColor green="119" alpha="255" red="119" blue="119"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="2" sectionWidth="142.117" size="142.117,187.018,mm" positionLock="true" background="false" sectionX="0" sectionY="0" itemRotation="0" hidePageIfEmpty="0" zValue="2" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" groupUuid="" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" excludeFromExports="0" frame="false" visibility="1" type="65647" opacity="1" sectionHeight="182.4" frameJoinStyle="round" blendMode="0" positionOnPage="290.617,6.0007,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" outlineWidthM="0.3,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" id="">
+        <FrameColor alpha="255" red="119" green="119" blue="119"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27171,21 +26430,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="246.665,178.41,mm" outlineWidthM="0.3,mm" pictureWidth="47.1065" position="246.665,178.41,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" blendMode="0" type="65640" size="47.1065,27.6,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="1" pictureHeight="27.561" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="47.1065,27.6,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="1" pictureWidth="47.1065" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" mapUuid="" resizeMode="0" anchorPoint="0" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="27.561" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="246.665,178.41,mm" mode="1" outlineWidthM="0.3,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27193,14 +26452,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" url="" evaluateExpressions="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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" type="65648" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12">
+      <LayoutMultiFrame maxBreakDistance="12" stylesheetEnabled="true" useSmartBreaks="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;}" type="65648" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" url="" resizeMode="0" evaluateExpressions="true" contentMode="1">
         <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27210,53 +26469,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropMarginUnit" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="rasterize" type="QString" value="false"/>
-          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="0" type="QString" name="imageCropMarginUnit"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="rasterize"/>
+          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;position&quot;" 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" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerName="marshal_positions" sortKey="position"/>
+      <Atlas filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" pageNameExpression="&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" sortFeatures="1" sortKey="position" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" printResolution="120" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Marshal Plan" printResolution="120">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27271,49 +26530,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" blendMode="0" type="65638" size="297,420,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,420,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27328,9 +26587,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27338,15 +26597,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="8" positionOnPage="15.6525,12.5708,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="21.6797,27,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="15.6525,12.5708,mm" wrapChar="" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" type="65642" positionLock="true" symbolHeight="4" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frame="false" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="false" equalColumnWidth="1" boxSpace="2" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" positionOnPage="15.6525,12.5708,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="21.6797,27,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" zValue="8" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" wmsLegendHeight="25" position="15.6525,12.5708,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27354,35 +26613,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="1" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27390,47 +26649,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="5.69321,399.106,mm" outlineWidthM="0.3,mm" labelText="MARSHAL POSITIONS" position="5.69321,399.106,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" blendMode="0" htmlState="0" type="65641" size="45.1194,7.36972,mm" halign="1" valign="64" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="45.1194,7.36972,mm" positionLock="true" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,399.106,mm" outlineWidthM="0.3,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27445,65 +26704,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" labelText="Page [% &quot;page&quot; %]" position="5.69321,406.988,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" blendMode="0" htmlState="0" type="65641" size="16.2476,7.80192,mm" halign="1" valign="32" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="16.2476,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Page [% &quot;page&quot; %]" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27518,65 +26777,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="214.292,406.988,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.2" position="214.292,406.988,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" blendMode="0" htmlState="0" type="65641" size="27.7839,7.51682,mm" halign="2" valign="32" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="27.7839,7.51682,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.2" positionOnPage="214.292,406.988,mm" outlineWidthM="0.3,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27591,65 +26850,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="185.72,399.107,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="185.72,399.107,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" blendMode="0" htmlState="0" type="65641" size="56.3557,7.36902,mm" halign="2" valign="64" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="56.3557,7.36902,mm" positionLock="true" background="false" itemRotation="0" zValue="4" marginX="1" groupUuid="" position="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="185.72,399.107,mm" outlineWidthM="0.3,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27664,39 +26923,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="243.319,382.696,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" position="243.319,382.696,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="8" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" svgBorderWidth="0.2" blendMode="0" type="65640" size="49.3143,31.2967,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="3" pictureHeight="28.8527" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="49.3143,31.2967,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="3" pictureWidth="49.3143" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="243.319,382.696,mm" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" mapUuid="" resizeMode="0" anchorPoint="8" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="28.8527" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="243.319,382.696,mm" mode="1" outlineWidthM="0.3,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27704,42 +26963,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="236.083,0.14328,mm" frame="false" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="236.083,0.14328,mm" positionLock="true" background="false" itemRotation="0" zValue="2" groupUuid="" position="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -27754,90 +27013,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal overview" labelMargin="0,mm" mapFlags="0" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.03,5.9483,mm" outlineWidthM="0.3,mm" position="5.03,5.9483,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" blendMode="0" followPreset="true" type="65639" size="286.94,392.396,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="286.94,392.396,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="5.03,5.9483,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal overview" positionOnPage="5.03,5.9483,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38613924055453452" ymin="-33.94797288016832226" xmin="18.36924763341120581" ymax="-33.9248732774534929"/>
+        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;page&quot;" 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" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="marshal_overviews" sortKey="page"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="marshal_overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" pageNameExpression="&quot;page&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" sortFeatures="1" sortKey="page" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27852,49 +27111,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27909,9 +27168,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27919,21 +27178,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="286.027,2,mm" outlineWidthM="0.3,mm" pictureWidth="6.31767" position="286.027,2,mm" pictureRotation="330" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" blendMode="0" type="65640" size="9.45865,11,mm" mode="0" northMode="0" frame="false" file="arrows/NorthArrow_11.svg" resizeMode="0" zValue="4" pictureHeight="7.97477" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="9.45865,11,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="6.31767" pictureRotation="330" groupUuid="" svgFillColor="255,255,255,255" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" resizeMode="0" anchorPoint="0" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="7.97477" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="286.027,2,mm" mode="0" outlineWidthM="0.3,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" id="" file="arrows/NorthArrow_11.svg" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27941,47 +27200,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginY="1" opacity="1" itemRotation="270" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" labelText="[%upper( &quot;area&quot; )%]" position="285.027,205.886,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" blendMode="0" htmlState="0" type="65641" size="142.543,10.3185,mm" halign="1" valign="64" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="142.543,10.3185,mm" positionLock="true" background="false" itemRotation="270" zValue="3" marginX="1" groupUuid="" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27996,65 +27255,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" unitLabel="m" lineCapStyle="square" numUnitsPerSegment="90" segmentSizeMode="1" zValue="2" positionOnPage="7,189.669,mm" groupUuid="" numSegments="4" numSubdivisions="1" unitType="meters" referencePoint="0" labelVerticalPlacement="0" visibility="1" subdivisionsHeight="1.5" boxContentSpace="1" labelHorizontalPlacement="0" style="Single Box" outlineWidthM="0.3,mm" maxBarWidth="150" frameJoinStyle="miter" excludeFromExports="0" size="155.4,16.2165,mm" outlineWidth="0.3" segmentMillimeters="28.5458" itemRotation="0" numMapUnitsPerScaleBarUnit="1" background="false" lineJoinStyle="miter" position="7,189.669,mm" type="65646" positionLock="true" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" id="" height="3" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" minBarWidth="50" frame="false" numSegmentsLeft="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelBarSpace="3" alignment="0">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" labelHorizontalPlacement="0" type="65646" frameJoinStyle="miter" lineCapStyle="square" boxContentSpace="1" maxBarWidth="150" id="" labelBarSpace="3" outlineWidth="0.3" lineJoinStyle="miter" visibility="1" labelVerticalPlacement="0" minBarWidth="50" background="false" opacity="1" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" subdivisionsHeight="1.5" style="Single Box" positionOnPage="7,189.669,mm" referencePoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" blendMode="0" outlineWidthM="0.3,mm" segmentSizeMode="1" numUnitsPerSegment="90" unitLabel="m" positionLock="true" size="155.4,16.2165,mm" excludeFromExports="0" alignment="0" itemRotation="0" numSubdivisions="1" unitType="meters" segmentMillimeters="28.5458" zValue="2" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" numSegments="4" position="7,189.669,mm" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28069,75 +27328,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" alpha="255" red="0" blue="0"/>
+        <strokeColor alpha="255" red="0" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="QChar" value=""/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="QChar" value=""/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" alpha="255" red="0" blue="0"/>
-        <fillColor2 green="255" alpha="255" red="255" blue="255"/>
+        <fillColor alpha="255" red="0" green="0" blue="0"/>
+        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28168,52 +27427,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28244,52 +27503,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28320,36 +27579,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -28364,36 +27623,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28408,87 +27667,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Start/Finish" labelMargin="0,mm" mapFlags="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="7,5.5,mm" outlineWidthM="0.3,mm" position="7,5.5,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="false" mapRotation="330" referencePoint="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" blendMode="0" followPreset="true" type="65639" size="278.027,180.318,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="278.027,180.318,mm" positionLock="true" background="false" drawCanvasItems="false" followPreset="true" mapRotation="330" itemRotation="0" zValue="1" groupUuid="" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Start/Finish" positionOnPage="7,5.5,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="rotation"/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="id"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" xmin="18.40843143571575169" ymax="-33.89880140828828559"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="1" topAnnotationDisplay="3" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="3" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="3" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="5" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="5" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="3" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="4" topAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="1" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="5" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="3" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="5" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28519,44 +27778,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -28579,9 +27838,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28598,32 +27857,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -28638,29 +27897,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28668,65 +27927,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
-          <Option name="svgCropMarginBottom" type="QString" value="0"/>
-          <Option name="svgCropMarginLeft" type="QString" value="0"/>
-          <Option name="svgCropMarginRight" type="QString" value="0"/>
-          <Option name="svgCropMarginTop" type="QString" value="0"/>
-          <Option name="svgCropToContents" type="QString" value="true"/>
-          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
-          <Option name="svgGroupLayers" type="QString" value="false"/>
-          <Option name="svgIncludeMetadata" type="QString" value="1"/>
-          <Option name="svgTextFormat" type="QString" value="0"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
+          <Option value="0" type="QString" name="svgCropMarginBottom"/>
+          <Option value="0" type="QString" name="svgCropMarginLeft"/>
+          <Option value="0" type="QString" name="svgCropMarginRight"/>
+          <Option value="0" type="QString" name="svgCropMarginTop"/>
+          <Option value="true" type="QString" name="svgCropToContents"/>
+          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
+          <Option value="false" type="QString" name="svgGroupLayers"/>
+          <Option value="1" type="QString" name="svgIncludeMetadata"/>
+          <Option value="0" type="QString" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;area&quot;" 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" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="start_finish_area" sortKey="area"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="start_finish_area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" pageNameExpression="&quot;area&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" sortFeatures="1" sortKey="area" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" printResolution="300" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Fencing" printResolution="300">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28741,49 +28000,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28798,9 +28057,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28808,47 +28067,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="6.76779,190.27,mm" outlineWidthM="0.3,mm" labelText="FENCING: [% &quot;name&quot; %]" position="6.76779,190.27,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" blendMode="0" htmlState="0" type="65641" size="148.46,7.36972,mm" halign="1" valign="64" frame="false" zValue="11">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="148.46,7.36972,mm" positionLock="true" background="false" itemRotation="0" zValue="11" marginX="1" groupUuid="" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,190.27,mm" outlineWidthM="0.3,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28863,65 +28122,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="211.295,197.64,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="211.295,197.64,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" blendMode="0" htmlState="0" type="65641" size="27.7839,7.51682,mm" halign="2" valign="32" frame="false" zValue="10">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="27.7839,7.51682,mm" positionLock="true" background="false" itemRotation="0" zValue="10" marginX="1" groupUuid="" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="211.295,197.64,mm" outlineWidthM="0.3,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28936,65 +28195,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="115.637,198.083,mm" outlineWidthM="0.3,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" position="115.637,198.083,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" blendMode="0" htmlState="0" type="65641" size="67.0856,7.80192,mm" halign="1" valign="32" frame="false" zValue="9">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="67.0856,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="9" marginX="1" groupUuid="" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="115.637,198.083,mm" outlineWidthM="0.3,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29009,65 +28268,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="59.5581,198.083,mm" outlineWidthM="0.3,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" position="59.5581,198.083,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" blendMode="0" htmlState="0" type="65641" size="53.0017,7.80192,mm" halign="1" valign="32" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="53.0017,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="1" groupUuid="" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="59.5581,198.083,mm" outlineWidthM="0.3,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29082,65 +28341,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" labelText="Page [% @atlas_featurenumber %]" position="6.76779,198.083,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" blendMode="0" htmlState="0" type="65641" size="52.7903,7.80192,mm" halign="1" valign="32" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="52.7903,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29155,39 +28414,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" position="243.098,175.353,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="8" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" blendMode="0" type="65640" size="49.3143,29.8354,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="6" pictureHeight="28.8527" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="49.3143,29.8354,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="6" pictureWidth="49.3143" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" mapUuid="" resizeMode="0" anchorPoint="8" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="28.8527" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="243.098,175.353,mm" mode="1" outlineWidthM="0.3,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29195,47 +28454,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="182.723,190.271,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 September 2020" position="182.723,190.271,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" blendMode="0" htmlState="0" type="65641" size="56.3557,7.36902,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="56.3557,7.36902,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 September 2020" positionOnPage="182.723,190.271,mm" outlineWidthM="0.3,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29250,60 +28509,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="232.01,0.14328,mm" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="232.01,0.14328,mm" positionLock="true" background="false" itemRotation="0" zValue="4" groupUuid="" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -29318,55 +28577,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem blendMode="0" unitLabel="m" lineCapStyle="square" numUnitsPerSegment="9" segmentSizeMode="1" zValue="3" positionOnPage="6.76779,2.8482,mm" groupUuid="" numSegments="2" numSubdivisions="1" unitType="meters" referencePoint="0" labelVerticalPlacement="0" visibility="1" subdivisionsHeight="1.5" boxContentSpace="0.2" labelHorizontalPlacement="0" style="Double Box" outlineWidthM="0.3,mm" maxBarWidth="100" frameJoinStyle="miter" excludeFromExports="0" size="101.03,15.8378,mm" outlineWidth="0.2" segmentMillimeters="30.7927" itemRotation="0" numMapUnitsPerScaleBarUnit="1" background="false" lineJoinStyle="round" position="6.76779,2.8482,mm" type="65646" positionLock="true" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" id="" height="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" minBarWidth="25" frame="false" numSegmentsLeft="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelBarSpace="1" alignment="0">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" labelHorizontalPlacement="0" type="65646" frameJoinStyle="miter" lineCapStyle="square" boxContentSpace="0.2" maxBarWidth="100" id="" labelBarSpace="1" outlineWidth="0.2" lineJoinStyle="round" visibility="1" labelVerticalPlacement="0" minBarWidth="25" background="false" opacity="1" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" subdivisionsHeight="1.5" style="Double Box" positionOnPage="6.76779,2.8482,mm" referencePoint="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" outlineWidthM="0.3,mm" segmentSizeMode="1" numUnitsPerSegment="9" unitLabel="m" positionLock="true" size="101.03,15.8378,mm" excludeFromExports="0" alignment="0" itemRotation="0" numSubdivisions="1" unitType="meters" segmentMillimeters="30.7927" zValue="3" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" numSegments="2" position="6.76779,2.8482,mm" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29381,75 +28640,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" alpha="255" red="0" blue="0"/>
+        <strokeColor alpha="255" red="0" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="QChar" value=""/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="QChar" value=""/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" alpha="255" red="0" blue="0"/>
-        <fillColor2 green="255" alpha="255" red="255" blue="255"/>
+        <fillColor alpha="255" red="0" green="0" blue="0"/>
+        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29480,52 +28739,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29556,52 +28815,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29632,36 +28891,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -29676,36 +28935,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29720,24 +28979,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="2" positionOnPage="256.808,2.9982,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="38.1563,54.9504,mm" itemRotation="0" resizeToContents="0" boxSpace="2" background="true" position="256.808,2.9982,mm" wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65642" positionLock="true" symbolHeight="4" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="0" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="1" boxSpace="2" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" positionOnPage="256.808,2.9982,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="38.1563,54.9504,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" zValue="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" position="256.808,2.9982,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29745,52 +29004,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Bold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="1" style="Bold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" source="./fencing.shp|layername=fencing" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option name="legend/expressionFilter" type="QString" value=""/>
-                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="" type="QString" name="legend/expressionFilter"/>
+                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29798,44 +29057,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Fencing" labelMargin="0,mm" mapFlags="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="false" mapRotation="0" referencePoint="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" followPreset="true" type="65639" size="283.418,180.92,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="283.418,180.92,mm" positionLock="true" background="false" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="0.9" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Fencing" positionOnPage="6.76779,9.35102,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" type="double" value="1"/>
-                      <Option name="maxOutput" type="double" value="360"/>
-                      <Option name="maxValue" type="double" value="0"/>
-                      <Option name="minOutput" type="double" value="0"/>
-                      <Option name="minValue" type="double" value="0"/>
-                      <Option name="nullOutput" type="double" value="0"/>
+              <Option value="" type="QString" 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="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>
-                    <Option name="t" type="int" value="0"/>
+                    <Option value="0" type="int" name="t"/>
                   </Option>
-                  <Option name="type" type="int" value="3"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4172496509604926" ymin="-33.90421228789515595" xmin="18.41635400827248503" ymax="-33.90364055490629625"/>
+        <Extent ymax="-33.90364055490629625" xmin="18.41635400827248503" xmax="18.4172496509604926" ymin="-33.90421228789515595"/>
         <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>
@@ -29850,45 +29109,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="1" topAnnotationDisplay="3" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="3" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="3" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="5" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="5" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="3" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="4" topAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="1" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="5" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="3" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="5" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29919,44 +29178,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29979,9 +29238,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29998,32 +29257,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30038,29 +29297,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30068,62 +29327,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="QString" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfOgcBestPracticeFormat" type="QString" value="0"/>
-          <Option name="pdfSimplify" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="rasterize" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="QString" name="pdfAppendGeoreference"/>
+          <Option value="0" type="QString" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="QString" name="pdfSimplify"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="rasterize"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="virtual" sortFeatures="1" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="fence_groups" sortKey="group"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" sortAscending="1" coverageLayerName="fence_groups" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1" sortFeatures="1" sortKey="group" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="9" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="9" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30138,49 +29397,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30195,59 +29454,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" labelText="Directions to Start of Race" position="4.43449,186.634,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" blendMode="0" htmlState="0" type="65641" size="83.9998,10.4638,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="83.9998,10.4638,mm" positionLock="false" background="false" itemRotation="0" zValue="8" marginX="1" groupUuid="" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30262,65 +29521,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" labelText="Gun Run" position="4.43449,197.498,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" blendMode="0" htmlState="0" type="65641" size="48.2923,9.511,mm" halign="1" valign="32" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="48.2923,9.511,mm" positionLock="false" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30335,33 +29594,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="6" positionOnPage="10.096,10.8563,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="0" referencePoint="0" visibility="1" legendFilterByMap="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="round" excludeFromExports="0" size="59.0766,76,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="10.096,10.8563,mm" wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65642" positionLock="false" symbolHeight="5" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" title="" symbolAlignment="1" symbolWidth="9" equalColumnWidth="0">
-        <FrameColor green="139" alpha="255" red="139" blue="139"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="round" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="5" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="9" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="0" boxSpace="2" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" positionOnPage="10.096,10.8563,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="false" size="59.0766,76,mm" excludeFromExports="0" fontColor="#000000" columnSpace="0" itemRotation="0" lineSpacing="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" zValue="6" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" position="10.096,10.8563,mm" title="" legendFilterByMap="1" wrapChar="">
+        <FrameColor alpha="255" red="139" green="139" blue="139"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30369,52 +29628,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="3" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" marginTop="2.5" marginLeft="3" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" type="QString" value="hidden"/>
+                <Option value="hidden" type="QString" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
-                  <Option name="legend/label-1" type="QString" value="Toilets"/>
-                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
-                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
-                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
-                  <Option name="legend/label-5" type="QString" value="Parking"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
+                  <Option value="Toilets" type="QString" name="legend/label-1"/>
+                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
+                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
+                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
+                  <Option value="Parking" type="QString" name="legend/label-5"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
-                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
-                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
+                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
+                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30422,47 +29681,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="221.862,190.027,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" blendMode="0" htmlState="0" type="65641" size="27.7839,6.871,mm" halign="2" valign="32" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="27.7839,6.871,mm" positionLock="false" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30477,65 +29736,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="197.975,197.498,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="false" background="false" itemRotation="0" zValue="4" marginX="1" groupUuid="" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30550,39 +29809,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="false" id="" positionOnPage="249.646,179.724,mm" outlineWidthM="0.3,mm" pictureWidth="41.6737" position="249.646,179.724,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" blendMode="0" type="65640" size="42.9838,24.3824,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="3" pictureHeight="24.3824" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="42.9838,24.3824,mm" positionLock="false" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="3" pictureWidth="41.6737" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="24.3824" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="249.646,179.724,mm" mode="1" outlineWidthM="0.3,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30590,42 +29849,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="244.912,0.1,mm" frame="false" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="244.912,0.1,mm" positionLock="false" background="false" itemRotation="0" zValue="2" groupUuid="" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -30640,46 +29899,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Ask Me" labelMargin="0,mm" mapFlags="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="4.43449,6.411,mm" outlineWidthM="0.3,mm" position="4.43449,6.411,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" blendMode="0" followPreset="true" type="65639" size="288.007,183.616,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="288.007,183.616,mm" positionLock="false" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Ask Me" positionOnPage="4.43449,6.411,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" xmin="18.39762336729721071" ymax="-33.8970204297764468"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30694,45 +29953,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30763,44 +30022,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30823,40 +30082,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30871,29 +30130,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30901,56 +30160,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="0" enabled="0" sortFeatures="0" pageNameExpression="" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" pageNameExpression="" hideCoverage="0" sortFeatures="0" filterFeatures="0" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="All Routes" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="All Routes" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30965,49 +30224,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31022,59 +30281,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="9.7863,192.073,mm" outlineWidthM="0.3,mm" labelText="The Gun Run 2022: [%&quot;Source&quot;%]" position="9.7863,192.073,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" blendMode="0" htmlState="0" type="65641" size="61.5373,6.60801,mm" halign="1" valign="64" frame="false" zValue="11">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="61.5373,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="10" marginX="1" groupUuid="" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" outlineWidthM="0.3,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31089,65 +30348,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="200.171,199.082,mm" outlineWidthM="0.3,mm" labelText="REVISION 1" position="200.171,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" blendMode="0" htmlState="0" type="65641" size="61.5373,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="61.5373,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="9" marginX="1" groupUuid="" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 2" positionOnPage="200.171,199.082,mm" outlineWidthM="0.3,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31162,65 +30421,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="9.7863,199.082,mm" outlineWidthM="0.3,mm" labelText="[% if( &quot;Distance&quot;   = '5KM' ,&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" position="9.7863,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" blendMode="0" htmlState="0" type="65641" size="61.5373,6.60801,mm" halign="1" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="61.5373,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="1" groupUuid="" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" positionOnPage="9.7863,199.082,mm" outlineWidthM="0.3,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31235,39 +30494,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="7" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31275,42 +30534,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.57644,198.832,mm" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.982,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.982,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="6" groupUuid="" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.57644,198.832,mm" outlineWidthM="0.3,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31325,348 +30584,171 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" blendMode="0" followPreset="false" type="65639" size="67.7828,166.874,mm" frame="true" isTemporal="0" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="67.7828,166.874,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="false" mapRotation="0" itemRotation="0" zValue="5" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Routes" positionOnPage="5.86559,4.09761,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" id="Left inset">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" ymin="-33.94700000000000273" xmin="18.37399999999999878" ymax="-33.91681492292400435"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
-          <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-                <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="0"/>
-                <prop k="capstyle" v="square"/>
-                <prop k="customdash" v="5;2"/>
-                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </lineStyle>
-          <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-                <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
-                </Option>
-                <prop k="angle" v="0"/>
-                <prop k="cap_style" v="square"/>
-                <prop k="color" v="0,0,0,255"/>
-                <prop k="horizontal_anchor_point" v="1"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="name" v="circle"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="0,0,0,255"/>
-                <prop k="outline_style" v="solid"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="scale_method" v="diameter"/>
-                <prop k="size" v="2"/>
-                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="size_unit" v="MM"/>
-                <prop k="vertical_anchor_point" v="1"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
-            <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                  <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
-                  </Option>
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,255"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="128,128,128,255"/>
-                  <prop k="outline_style" v="no"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-            <dd_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </dd_properties>
-          </text-style>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-        </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.50144,5.50066,mm" outlineWidthM="0.15,mm" position="9.50144,5.50066,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" blendMode="0" followPreset="false" type="65639" size="282.372,186.234,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="113.3,76.1023,mm" positionLock="true" background="true" drawCanvasItems="true" followPreset="false" mapRotation="0" itemRotation="0" zValue="4" groupUuid="" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="" positionOnPage="126.141,118.975,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" keepLayerSet="false" id="Bottom inset">
+        <FrameColor alpha="255" red="103" green="34" blue="144"/>
+        <BackgroundColor alpha="255" red="200" green="175" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '9000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '4500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
-                </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.372'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.381'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.398'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
-                </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.926'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.921'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.909'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41637827489956081" ymin="-33.90899999999999892" xmin="18.39799999999999969" ymax="-33.89687887068020444"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <AtlasMap scalingMode="0" atlasDriven="0" margin="0.10000000000000001"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+      </LayoutItem>
+      <LayoutItem referencePoint="0" size="282.372,186.234,mm" positionLock="true" background="true" drawCanvasItems="true" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="Routes" positionOnPage="9.50144,5.50066,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" id="Main Map">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" 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>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.381'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option 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.926'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.909'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+              </Option>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymax="-33.89971725489651533" xmin="18.36400000000000077" xmax="18.45388556738963004" ymin="-33.95900000000000318"/>
+        <LayerSet/>
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31697,44 +30779,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31757,40 +30839,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31805,29 +30887,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31835,63 +30917,125 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.19" scalingMode="2" atlasDriven="0"/>
+        <ComposerMapOverview frameMap="" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" blendMode="0" centered="0" show="1" inverted="0" name="Overview 1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" 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>
+                </Option>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <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>
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="103,34,144,26"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="103,34,144,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <LayoutObject>
+            <dataDefinedProperties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dataDefinedProperties>
+            <customproperties>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+        </ComposerMapOverview>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0~~~route_markers_137272a0_69df_47f0_82f8_521b9f4bef83~~~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"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0~~~route_markers_137272a0_69df_47f0_82f8_521b9f4bef83~~~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" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="1" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="0" coverageLayerName="all_routes" sortKey="length_m"/>
+      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" sortFeatures="1" sortKey="&quot;Sort&quot;" filterFeatures="1" enabled="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" printResolution="120" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Marshal Plan A1" printResolution="120">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31906,49 +31050,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0" type="65638" size="594,841,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="594,841,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31963,9 +31107,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31973,15 +31117,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="8" positionOnPage="25.5925,18.7971,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="18.6109,9,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="25.5925,18.7971,mm" wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" type="65642" positionLock="true" symbolHeight="4" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="false" equalColumnWidth="1" boxSpace="2" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" positionOnPage="25.5925,18.7971,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="18.6109,9,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" zValue="8" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" position="25.5925,18.7971,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31989,37 +31133,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="1" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" patch_size="0,0" id="all_routes20170907054841602" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="QString" value="0"/>
+                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="QString" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32027,47 +31171,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" labelText="MARSHAL POSITIONS" position="5.2963,808.939,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" blendMode="0" htmlState="0" type="65641" size="91.9494,15.0649,mm" halign="1" valign="64" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="91.9494,15.0649,mm" positionLock="true" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32082,65 +31226,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.2" position="430.403,825.052,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" blendMode="0" htmlState="0" type="65641" size="56.6212,15.3656,mm" halign="2" valign="32" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="56.6212,15.3656,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32155,65 +31299,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="372.175,808.942,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" blendMode="0" htmlState="0" type="65641" size="114.848,15.0635,mm" halign="2" valign="64" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="114.848,15.0635,mm" positionLock="true" background="false" itemRotation="0" zValue="4" marginX="1" groupUuid="" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32228,39 +31372,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="489.557,775.395,mm" outlineWidthM="0.3,mm" pictureWidth="100.498" position="489.557,775.395,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="8" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" blendMode="0" type="65640" size="100.498,63.9757,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="3" pictureHeight="58.7992" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="100.498,63.9757,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="3" pictureWidth="100.498" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" mapUuid="" resizeMode="0" anchorPoint="8" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="58.7992" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="489.557,775.395,mm" mode="1" outlineWidthM="0.3,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32268,42 +31412,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="481.428,0.606138,mm" frame="false" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="481.428,0.606138,mm" positionLock="true" background="false" itemRotation="0" zValue="2" groupUuid="" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32318,90 +31462,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal overview" labelMargin="0,mm" mapFlags="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="3.94474,5.25965,mm" outlineWidthM="0.3,mm" position="3.94474,5.25965,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" blendMode="0" followPreset="true" type="65639" size="584.759,811.213,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="584.759,811.213,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal overview" positionOnPage="3.94474,5.25965,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42299397558693741" ymin="-33.95821655848814657" xmin="18.37434415142052657" ymax="-33.89072661913806428"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="virtual" sortFeatures="1" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="complete_marshal_overview" sortKey="page"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" sortAscending="1" coverageLayerName="complete_marshal_overview" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" pageNameExpression="&quot;page&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" sortFeatures="1" sortKey="page" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Access Roads" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32416,49 +31560,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32473,27 +31617,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="15" positionOnPage="244.484,130.172,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="34.45,40.8,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="244.484,130.172,mm" wrapChar="" type="65642" positionLock="true" symbolHeight="4" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="0">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="185" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="0" boxSpace="2" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" positionOnPage="244.484,130.172,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="34.45,40.8,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" zValue="15" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" position="244.484,130.172,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="185" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32501,35 +31645,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32537,47 +31681,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="0" positionLock="true" id="" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" labelText="ACCESS ROUTES FOR RESIDENTS" position="9.37446,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" blendMode="0" htmlState="0" type="65641" size="194.851,7.272,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="194.851,7.272,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="0" groupUuid="" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32592,65 +31736,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.1" position="204.225,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" blendMode="0" htmlState="0" type="65641" size="57.4836,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="57.4836,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32665,65 +31809,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32738,39 +31882,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32778,42 +31922,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.959,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.959,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="3" groupUuid="" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32828,61 +31972,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" blendMode="0" followPreset="true" type="65639" size="67.7828,166.874,mm" frame="true" isTemporal="0" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="67.7828,166.874,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="2" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Access Routes" positionOnPage="5.86559,4.09761,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32897,45 +32041,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32966,44 +32110,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33026,40 +32170,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33074,29 +32218,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33104,45 +32248,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" blendMode="0" followPreset="true" type="65639" size="282.012,175.592,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="282.012,175.592,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="Access Routes" positionOnPage="9.44946,9.08557,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" xmin="18.37000000000000099" ymax="-33.89697816224119009"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33157,45 +32301,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33226,44 +32370,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33286,40 +32430,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33334,29 +32478,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33364,56 +32508,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayerName="residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33428,49 +32572,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33485,59 +32629,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="0" positionLock="true" id="" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" labelText="Access to P9 Parking and VIP Tent" position="9.37446,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" blendMode="0" htmlState="0" type="65641" size="194.851,7.272,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="194.851,7.272,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="0" groupUuid="" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33552,65 +32696,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="204.225,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" blendMode="0" htmlState="0" type="65641" size="57.4836,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="57.4836,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33625,65 +32769,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33698,39 +32842,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" mapUuid="" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33738,42 +32882,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.959,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.959,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="3" groupUuid="" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33788,46 +32932,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="" labelMargin="0,mm" mapFlags="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="9.44946,7.25098,mm" outlineWidthM="0.15,mm" position="9.44946,7.25098,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" blendMode="0" followPreset="false" type="65639" size="282.012,182.649,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="282.012,182.649,mm" positionLock="false" background="true" drawCanvasItems="false" followPreset="false" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="" positionOnPage="9.44946,7.25098,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40919746780259914" ymin="-33.90848231674397084" xmin="18.40103928699269886" ymax="-33.90319854486631357"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33842,45 +32986,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33911,44 +33055,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33971,40 +33115,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34019,29 +33163,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34049,37 +33193,37 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="0" coverageLayerProvider="ogr" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayerName="residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="0"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.4549366430076951" ymin="-33.92778655896992035" xmin="18.37381723755126117" ymax="-33.88415099189598578">
+    <DefaultViewExtent ymax="-33.9294480020586775" xmin="18.39544225003047728" xmax="18.44804000918376374" ymin="-33.95774126967519635">
       <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>
@@ -34093,41 +33237,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///RamFCc_styles.db" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option name="decimal_separator" type="QChar" value=""/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="direction_format" type="int" value="0"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="QChar" value=""/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="direction_format"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
-        <Option name="decimal_separator" type="QChar" value=""/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
-        <Option name="show_leading_zeros" type="bool" value="false"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_suffix" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="QChar" value=""/>
+        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
+        <Option value="false" type="bool" name="show_leading_zeros"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="false" type="bool" name="show_suffix"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index e91a06a..e83ebe9 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 40a53bc..054ce22 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveUser="tim" saveUserFull="Timothy Allen" saveDateTime="2022-07-15T12:30:53" projectname="Gun Run" version="3.26.0-Buenos Aires">
+<qgis saveDateTime="2022-07-27T12:19:19" saveUser="tim" saveUserFull="Timothy Allen" version="3.26.1-Buenos Aires" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,231 +21,224 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Unchecked" name="Marshals" expanded="0" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="marshal_positions" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="extra_security" expanded="1" id="extra_security20170921130834191" legend_split_behavior="0" source="./extra_security.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./extra_security.shp" patch_size="0,0" id="extra_security20170921130834191" legend_exp="" name="extra_security">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="marshals_by_position" expanded="1" id="marshals_by_position20161003112326575" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" providerKey="delimitedtext" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="delimitedtext" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0" id="marshals_by_position20161003112326575" legend_exp="" name="marshals_by_position">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="complete_marshal_overview" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" providerKey="virtual" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" name="complete_marshal_overview">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="marshal_overviews" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" name="marshal_overviews">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" source="./fencing.shp|layername=fencing" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+            <Option value="" type="QString" name="legend/expressionFilter"/>
+            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="fence_groups" expanded="1" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" providerKey="virtual" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" patch_size="0,0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" legend_exp="" name="fence_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="timelapse" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse" providerKey="ogr" legend_exp="">
+      <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-      </layer-tree-layer>
-      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1" groupLayer="">
-        <customproperties>
-          <Option/>
-        </customproperties>
-        <layer-tree-layer patch_size="-1,-1" checked="Qt::Checked" name="route_markers" expanded="1" id="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0" legend_split_behavior="0" source="Point?crs=EPSG:4326&amp;uid={ddc97530-fd24-42f8-8cbd-7e207206a3c9}" providerKey="memory" legend_exp="">
+        <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="memory" source="Point?crs=EPSG:4326&amp;uid={be6c7bcc-3484-4b97-8be7-9b015d8f692e}" patch_size="-1,-1" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" legend_exp="" name="route_markers">
           <customproperties>
             <Option type="Map">
-              <Option name="showFeatureCount" type="int" value="1"/>
-            </Option>
-          </customproperties>
-        </layer-tree-layer>
-        <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="route markers" expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" legend_split_behavior="0" 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:Integer64(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:(0,0)&amp;field=distance:(0,0)&amp;uid={bfd732a1-6419-4425-a0bc-d04578597c79}" providerKey="memory" legend_exp="">
-          <customproperties>
-            <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option name="showFeatureCount" type="QString" value="1"/>
+              <Option value="1" type="int" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="0" type="int" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Feeding Stations" expanded="1" groupLayer="">
+    <layer-tree-layer checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " patch_size="0,0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" name="timelapse">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="water_tables" expanded="1" id="water_tables20170921142016467" legend_split_behavior="0" source="./water_tables.shp" providerKey="ogr" legend_exp="">
+    </layer-tree-layer>
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Feeding Stations">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./water_tables.shp" patch_size="0,0" id="water_tables20170921142016467" legend_exp="" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Ask Me">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Residents Access">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="mayor" expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_split_behavior="0" source="./mayor.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./mayor.shp" patch_size="0,0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" name="mayor">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="viplabels" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_split_behavior="0" source="./viplabels.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./viplabels.shp" patch_size="0,0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" name="viplabels">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="vipaccess" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_split_behavior="0" source="./vipaccess.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./vipaccess.shp" patch_size="0,0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" name="vipaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="golfaccess" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_split_behavior="0" source="./golfaccess.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./golfaccess.shp" patch_size="0,0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" name="golfaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="residents_access" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./residents_access.shp|layername=residents_access" patch_size="0,0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" name="residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="osm_roads" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_split_behavior="0" source="./osm_roads.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="0" legend_split_behavior="0" providerKey="ogr" source="./osm_roads.shp" patch_size="0,0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="osm_places" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./osm_places.shp|layername=osm_places" patch_size="0,0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="data-comments" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_split_behavior="0" source="./data-comments.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./data-comments.shp" patch_size="0,0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" name="data-comments">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="start_finish_area" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_split_behavior="0" source="./start_finish_area.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./start_finish_area.shp" patch_size="0,0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" name="start_finish_area">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" groupLayer="" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="capetownelevation-1m" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_split_behavior="0" source="./capetownelevation-1m.shp" providerKey="ogr" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./capetownelevation-1m.shp" patch_size="0,0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" name="capetownelevation-1m">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option value="1" type="QString" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" providerKey="gdal" legend_exp="">
+      <layer-tree-layer checked="Qt::Unchecked" expanded="1" legend_split_behavior="0" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="Outlines" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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" providerKey="wms" legend_exp="">
+      <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="wms" 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" patch_size="0,0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -269,53 +262,51 @@
       <item>data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12</item>
       <item>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</item>
       <item>all_routes_5833accf_77da_42ef_a24a_197208cd2190</item>
-      <item>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</item>
       <item>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</item>
       <item>golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d</item>
       <item>vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea</item>
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0</item>
+      <item>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="1" mode="1" minScale="0" maxScale="0" type="1" tolerance="10" intersection-snapping="1" scaleDependencyMode="0" unit="1" self-snapping="0">
+  <snapping-settings intersection-snapping="1" minScale="0" maxScale="0" mode="3" self-snapping="1" type="1" tolerance="10" unit="1" enabled="1" scaleDependencyMode="0">
     <individual-layer-settings>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="extra_security20170921130834191" type="2" tolerance="0" units="2"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0" type="0" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="1" minScale="0" maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" tolerance="20" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="water_tables20170921142016467" type="2" tolerance="0" units="2"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" type="1" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" tolerance="12" units="1"/>
-      <layer-setting enabled="0" minScale="0" maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" tolerance="12" units="1"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="0" tolerance="12" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="2" type="2" tolerance="0" id="water_tables20170921142016467" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="2" type="2" tolerance="0" id="extra_security20170921130834191" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="1" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1"/>
+      <layer-setting minScale="0" maxScale="0" units="1" type="2" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
   <polymorphicRelations/>
-  <mapcanvas name="theMapCanvas" annotationsVisible="1">
+  <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.37381723755126117</xmin>
-      <ymin>-33.92007994238203139</ymin>
-      <xmax>18.4549366430076951</xmax>
-      <ymax>-33.89185760848387474</ymax>
+      <xmin>18.41060297945224278</xmin>
+      <ymin>-33.94803774489098203</ymin>
+      <xmax>18.4303271391347252</xmax>
+      <ymax>-33.94117549267154743</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -336,166 +327,198 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Unchecked" name="Marshals" open="false">
-      <legendlayer checked="Qt::Unchecked" name="marshal_positions" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Marshals">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="marshal_positions" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="extra_security" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="extra_security" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshals_by_position" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="marshals_by_position" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="complete_marshal_overview" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="complete_marshal_overview" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshal_overviews" drawingOrder="-1" showFeatureCount="0" open="false">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="false" name="marshal_overviews" drawingOrder="-1">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Fencing and Cones" open="false">
-      <legendlayer checked="Qt::Checked" name="fencing" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Fencing and Cones">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="fencing" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="fence_groups" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="fence_groups" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0"/>
+          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Routes" open="true">
-      <legendlayer checked="Qt::Unchecked" name="timelapse" drawingOrder="-1" showFeatureCount="0" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
-        </filegroup>
-      </legendlayer>
-      <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Checked" name="route_markers" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup checked="Qt::Checked" open="true" name="Routes">
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer checked="Qt::Checked" showFeatureCount="1" open="true" name="route_markers" drawingOrder="-1">
           <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0" visible="1"/>
-          </filegroup>
-        </legendlayer>
-        <legendlayer checked="Qt::Unchecked" name="route markers" drawingOrder="-1" showFeatureCount="1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" visible="0"/>
+            <legendlayerfile layerid="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" name="all_routes" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="all_routes" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" name="water_tables" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="false" name="timelapse" drawingOrder="-1">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+      </filegroup>
+    </legendlayer>
+    <legendgroup checked="Qt::Unchecked" open="true" name="Feeding Stations">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="water_tables" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="0"/>
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" name="poi_labels" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="poi_labels" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="directions_to_start" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="directions_to_start" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" name="mayor" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="mayor" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="viplabels" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="viplabels" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="vipaccess" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="vipaccess" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="golfaccess" drawingOrder="-1" showFeatureCount="0" open="false">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="false" name="golfaccess" drawingOrder="-1">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access_roads" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="residents_access_roads" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="residents_access" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" name="osm_roads" drawingOrder="-1" showFeatureCount="1" open="false">
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer checked="Qt::Checked" showFeatureCount="1" open="false" name="osm_roads" drawingOrder="-1">
         <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="osm_places" drawingOrder="-1" showFeatureCount="1" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="1" open="true" name="osm_places" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="false">
-      <legendlayer checked="Qt::Unchecked" name="data-comments" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Start and Finish pages">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="data-comments" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="start_finish_area" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="start_finish_area" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" name="capetownelevation-1m" drawingOrder="-1" showFeatureCount="1" open="true">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="1" open="true" name="capetownelevation-1m" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" showFeatureCount="0" open="true">
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" open="true" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="Outlines" drawingOrder="-1" showFeatureCount="0" open="true">
+      <legendlayer checked="Qt::Checked" showFeatureCount="0" open="true" name="Outlines" drawingOrder="-1">
         <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" refreshOnNotifyMessage="" type="annotation" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+  <mapcanvas annotationsVisible="1" name="mAreaCanvas">
+    <units>degrees</units>
+    <extent>
+      <xmin>0</xmin>
+      <ymin>0</ymin>
+      <xmax>0</xmax>
+      <ymax>0</ymax>
+    </extent>
+    <rotation>0</rotation>
+    <destinationsrs>
+      <spatialrefsys nativeFormat="Wkt">
+        <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+        <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+        <srsid>3452</srsid>
+        <srid>4326</srid>
+        <authid>EPSG:4326</authid>
+        <description>WGS 84</description>
+        <projectionacronym>longlat</projectionacronym>
+        <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </destinationsrs>
+    <rendermaptile>0</rendermaptile>
+    <expressionContextScope/>
+  </mapcanvas>
+  <mapcanvas annotationsVisible="1" name="georefCanvas">
+    <units>unknown</units>
+    <extent>
+      <xmin>0</xmin>
+      <ymin>0</ymin>
+      <xmax>0</xmax>
+      <ymax>0</ymax>
+    </extent>
+    <rotation>0</rotation>
+    <rendermaptile>0</rendermaptile>
+    <expressionContextScope/>
+  </mapcanvas>
+  <main-annotation-layer legendPlaceholderImage="" autoRefreshEnabled="0" type="annotation" refreshOnNotifyEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -546,7 +569,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshTime="0" minScale="1e+08" refreshOnNotifyMessage="" maxScale="100000" type="raster" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+    <maplayer maxScale="100000" minScale="1e+08" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" type="raster" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -611,7 +634,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -622,9 +645,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
-        <noDataList useSrcNoData="0" bandNo="2"/>
-        <noDataList useSrcNoData="0" bandNo="3"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList bandNo="2" useSrcNoData="0"/>
+        <noDataList bandNo="3" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -636,58 +659,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" band="1" symbology="Line" zscale="1">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -718,36 +741,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -762,9 +785,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -773,24 +796,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Value"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Value" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.5" nodataColor="" redBand="1" type="multibandcolor" alphaBand="-1" greenBand="2" blueBand="3">
+        <rasterrenderer greenBand="2" redBand="1" opacity="0.5" blueBand="3" type="multibandcolor" alphaBand="-1" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -802,13 +828,13 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation grayscaleMode="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" saturation="0" colorizeStrength="100" colorizeOn="0" invertColors="0"/>
+        <huesaturation grayscaleMode="0" saturation="0" colorizeRed="255" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" refreshOnNotifyMessage="" maxScale="0" type="raster" autoRefreshEnabled="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+    <maplayer maxScale="0" minScale="1e+08" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" type="raster" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -873,7 +899,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -884,7 +910,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -896,58 +922,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" band="1" symbology="Line" zscale="1">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -978,36 +1004,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1022,9 +1048,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1033,24 +1059,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Undefined"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
+          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="Undefined" type="QString" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option value="" type="QString" name="name"/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option value="collection" type="QString" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" enabled="false"/>
         </provider>
-        <rasterrenderer opacity="0.75" nodataColor="" type="singlebandcolordata" alphaBand="-1" band="1">
+        <rasterrenderer band="1" opacity="0.75" type="singlebandcolordata" alphaBand="-1" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1062,22 +1091,22 @@
           </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation grayscaleMode="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" saturation="0" colorizeStrength="100" colorizeOn="0" invertColors="0"/>
+        <huesaturation grayscaleMode="0" saturation="0" colorizeRed="255" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.94586066151139647</ymin>
+        <ymin>-33.95649000000000228</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.94586066151139647</ymin>
+        <ymin>-33.95649000000000228</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </wgs84extent>
@@ -1133,7 +1162,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1147,8 +1176,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="6" subType="0" name="length_m" type="2" typeName="integer" precision="0" expression="$length" comment=""/>
-        <field length="-1" subType="0" name="length_km" type="6" typeName="double precision" precision="0" expression="$length / 1000" comment=""/>
+        <field typeName="integer" precision="0" type="2" length="6" expression="$length" name="length_m" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="$length / 1000" name="length_km" subType="0" comment=""/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1161,58 +1190,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="RouteLen" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1243,36 +1272,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1287,44 +1316,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1347,51 +1376,52 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule symbol="0" label="Active Routes" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" 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="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Distance&quot; = '21KM'"/>
-            <rule symbol="2" label="10KM" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Distance&quot; = '10KM'"/>
-            <rule symbol="3" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Distance&quot; = '25'"/>
+          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" label="Active Routes" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas">
+            <rule filter="&quot;Source&quot; = '21KM'" symbol="1" checkstate="0" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule filter="&quot;Source&quot; = '10KM'" symbol="2" checkstate="0" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends"/>
+            <rule filter="&quot;Source&quot; = '5KM'" symbol="3" checkstate="0" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}" description="This should be disabled, since it's only for legends"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" symbol="4" checkstate="0" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="5" checkstate="0" label="Always show" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1411,44 +1441,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1464,32 +1494,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@0@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@0@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="0,0,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1504,15 +1534,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1520,35 +1550,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1579,36 +1609,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1628,40 +1658,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1684,38 +1714,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" 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"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1735,40 +1765,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1791,47 +1821,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" 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"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1851,44 +1881,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1904,32 +1934,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1944,15 +1974,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1960,35 +1990,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2019,36 +2049,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2068,40 +2098,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2124,38 +2154,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2175,40 +2205,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2231,47 +2261,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2291,44 +2321,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2344,32 +2374,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@2@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2384,15 +2414,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2400,35 +2430,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2459,36 +2489,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2508,40 +2538,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2564,38 +2594,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2615,40 +2645,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2671,47 +2701,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2731,44 +2761,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2784,32 +2814,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@3@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@3@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="145,211,55,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="145,211,55,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -2824,15 +2854,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2840,35 +2870,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,211,55,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,211,55,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2899,36 +2929,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2948,40 +2978,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3004,38 +3034,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="FirstVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3055,40 +3085,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="145,211,55,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="2" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3111,58 +3141,498 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="250" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
+              </Option>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="500"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="250"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="RenderMetersInMapUnits"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="Interval"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" 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>
+                    <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>
+                  </Option>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@4@0">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                  <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>
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="name" v="filled_arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MapUnit"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@4@0@0">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <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>
+                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="color" v="0,72,255,255"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="227,26,28,0"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="style" v="solid"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" 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>
+                          </Option>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                </layer>
+              </symbol>
+            </layer>
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,72,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.5" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+              </Option>
+              <prop k="align_dash_pattern" v="0"/>
+              <prop k="capstyle" v="square"/>
+              <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="MapUnit"/>
+              <prop k="dash_pattern_offset" v="0"/>
+              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="dash_pattern_offset_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,72,255,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="MapUnit"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="trim_distance_end" v="0"/>
+              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_end_unit" v="MM"/>
+              <prop k="trim_distance_start" v="0"/>
+              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="trim_distance_start_unit" v="MM"/>
+              <prop k="tweak_dash_pattern_on_corners" v="0"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" 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>
+                  </Option>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+              <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>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="LastVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@4@2">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                  <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>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" 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>
+                      </Option>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+              <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>
+              <prop k="average_angle_length" v="4"/>
+              <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="average_angle_unit" v="MM"/>
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="place_on_every_part" v="true"/>
+              <prop k="placements" v="FirstVertex"/>
+              <prop k="ring_filter" v="0"/>
+              <prop k="rotate" v="1"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@4@3">
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
+                  </Option>
+                </data_defined_properties>
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                  <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>
+                  <prop k="angle" v="0"/>
+                  <prop k="cap_style" v="square"/>
+                  <prop k="color" v="0,72,255,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,0"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
+                  <data_defined_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" 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>
+                      </Option>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </data_defined_properties>
+                </layer>
+              </symbol>
+            </layer>
+          </symbol>
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="5">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <Option type="Map">
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3193,54 +3663,112 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{b89b4717-3f7c-4d8e-9ab9-cc625678cd6b}">
-          <rule description="Active routes" active="0" key="{083f327b-ab34-44ac-8c89-87fb4a112901}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{0ba56ba6-21a8-4c4c-9148-41f946721f2a}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{4f8efdda-7a44-4a18-ab72-9bbcbcdbd62c}" description="Active routes" active="0">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="round($length / 1000, 0)" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="round($length / 1000, 0)" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                  <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="164,113,88,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="164,113,88,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3255,119 +3783,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                            <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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="km_marker()" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="1" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="km_marker()" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="3" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="1" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -3376,61 +3883,67 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -3461,9 +3974,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3471,12 +3984,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -3484,15 +3997,15 @@
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3501,8 +4014,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3511,8 +4024,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3521,8 +4034,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3531,8 +4044,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3541,8 +4054,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3551,8 +4064,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3561,18 +4074,25 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
+        <field name="Sort" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -3581,48 +4101,51 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="length_m" name="" index="8"/>
-        <alias field="length_km" name="" index="9"/>
+        <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="length_m" name=""/>
+        <alias index="10" field="length_km" 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="length_m" applyOnUpdate="0" expression=""/>
-        <default field="length_km" 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="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Sort" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -3633,29 +4156,31 @@
         <constraint field="Distance" exp="" desc=""/>
         <constraint field="RouteLen" exp="" desc=""/>
         <constraint field="Source" exp="" desc=""/>
+        <constraint field="Sort" exp="" desc=""/>
         <constraint field="length_m" exp="" desc=""/>
         <constraint field="length_km" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="6" subType="0" name="length_m" type="2" typeName="integer" precision="0" expression="$length" comment=""/>
-        <field length="-1" subType="0" name="length_km" type="6" typeName="double precision" precision="0" expression="$length / 1000" comment=""/>
+        <field typeName="integer" precision="0" type="2" length="6" expression="$length" name="length_m" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="$length / 1000" name="length_km" subType="0" comment=""/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Name&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
         <columns>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="begin" type="field" width="163" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="Name" width="152"/>
+          <column hidden="0" type="field" name="descriptio" width="-1"/>
+          <column hidden="0" type="field" name="timestamp" width="-1"/>
+          <column hidden="0" type="field" name="begin" width="163"/>
+          <column hidden="0" type="field" name="end" width="-1"/>
+          <column hidden="0" type="field" name="Distance" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="RouteLen" width="-1"/>
+          <column hidden="0" type="field" name="Source" width="-1"/>
+          <column hidden="0" type="field" name="length_m" width="-1"/>
+          <column hidden="0" type="field" name="Sort" width="-1"/>
+          <column hidden="0" type="field" name="length_km" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3687,28 +4212,28 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="0"/>
-        <field name="length_m" editable="0"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
         <field reuseLastValue="0" name="Distance"/>
@@ -3727,7 +4252,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3800,58 +4325,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3882,36 +4407,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -3926,44 +4451,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -3986,54 +4511,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="183,72,75,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="183,72,75,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4064,9 +4589,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4076,7 +4601,11 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <Option/>
+        <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>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
@@ -4085,7 +4614,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="ID" configurationFlags="None">
@@ -4111,19 +4640,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="ID" name="" index="0"/>
-        <alias field="height" name="" index="1"/>
-        <alias field="elevation" name="" index="2"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
+        <constraint field="ID" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="height" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="elevation" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="ID" exp="" desc=""/>
@@ -4134,7 +4663,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4157,7 +4686,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Polygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Polygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -4232,58 +4761,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4314,36 +4843,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -4358,44 +4887,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -4418,38 +4947,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -4464,9 +4993,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4476,18 +5005,22 @@ def my_form_open(dialog, layer, feature):
         <sizescale/>
       </renderer-v2>
       <customproperties>
-        <Option/>
+        <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>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -4513,19 +5046,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -4536,7 +5069,7 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4559,7 +5092,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -4624,7 +5157,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4649,58 +5182,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4731,36 +5264,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -4775,44 +5308,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -4835,54 +5368,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,85,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,85,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4913,9 +5446,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4926,32 +5459,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="Name" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="Name" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -4966,113 +5499,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="LineGeometry" geometryGeneratorEnabled="0" priority="5"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -5103,9 +5639,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5113,12 +5649,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -5126,7 +5662,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -5145,16 +5681,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Name" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -5164,11 +5700,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="Name" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5200,12 +5736,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5213,7 +5749,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5278,7 +5814,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5303,58 +5839,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5385,36 +5921,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -5429,44 +5965,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -5489,48 +6025,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;distance&quot; = '21KM'" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '10KM'" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '5KM'" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5550,40 +6086,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="miter"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="area"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="miter" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="area" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5606,32 +6142,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5651,44 +6187,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="210,32,39,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -5704,32 +6240,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@0@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@0@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="210,32,39,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -5744,9 +6280,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5754,35 +6290,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="210,32,39,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -5813,39 +6349,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5865,44 +6401,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -5918,32 +6454,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -5958,9 +6494,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5968,24 +6504,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6005,44 +6541,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -6058,32 +6594,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -6098,9 +6634,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6108,35 +6644,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6167,39 +6703,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="500" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6219,44 +6755,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -6272,32 +6808,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@2@0@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.5" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -6312,9 +6848,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6322,24 +6858,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="100" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -6359,44 +6895,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="offsetAlongLine" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="69,100,25,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MapUnit" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -6412,32 +6948,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@2@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@2@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="69,100,25,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -6452,9 +6988,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6462,35 +6998,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="69,100,25,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="69,100,25,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -6521,71 +7057,74 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6616,9 +7155,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6626,12 +7165,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -6639,7 +7178,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -6653,24 +7192,24 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="Distance" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -6680,11 +7219,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="id" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="Distance" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6716,30 +7255,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -6747,7 +7286,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -6820,58 +7359,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6902,36 +7441,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -6946,44 +7485,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7006,46 +7545,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="0.796078" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="0.796078" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="227,0,185,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="227,0,185,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,0" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7068,15 +7607,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7087,34 +7626,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="8" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7129,151 +7668,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="1" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="8" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="1" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="8"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="227,0,185,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="4" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="4" fontKerning="1" textColor="227,0,185,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -7288,89 +7827,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="1" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="2" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="2" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -7379,191 +7918,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7594,9 +8136,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7604,12 +8146,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="10" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -7617,15 +8159,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -7634,8 +8176,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -7644,27 +8186,27 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -7675,12 +8217,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="position" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="position" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7756,7 +8298,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Polygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Polygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7831,58 +8373,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7913,36 +8455,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -7957,44 +8499,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8017,38 +8559,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,85,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,85,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,85,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,85,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -8063,9 +8605,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8076,57 +8618,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -8157,9 +8702,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8167,12 +8712,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -8180,7 +8725,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="name" configurationFlags="None">
@@ -8220,25 +8765,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="name" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="cone_len" name="" index="3"/>
-        <alias field="fence_len" name="" index="4"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="cone_len" name=""/>
+        <alias index="4" field="fence_len" name=""/>
       </aliases>
       <defaults>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="group" applyOnUpdate="0" expression=""/>
-        <default field="type" 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="cone_len" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="name" exp="" desc=""/>
@@ -8251,14 +8796,14 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="group" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="cone_len" type="field" width="-1" hidden="0"/>
-          <column name="fence_len" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="name" width="-1"/>
+          <column hidden="0" type="field" name="group" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="cone_len" width="-1"/>
+          <column hidden="0" type="field" name="fence_len" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8290,12 +8835,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
       </editable>
       <labelOnTop>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8303,7 +8848,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8368,7 +8913,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8382,47 +8927,47 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="cone_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" subType="0" comment=""/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyAlgorithm="0" minScale="1e+08" maxScale="0" simplifyMaxScale="1" simplifyLocal="1" simplifyDrawingHints="1" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" labelsEnabled="1">
+          <qgis minScale="1e+08" simplifyAlgorithm="0" maxScale="0" labelsEnabled="1" simplifyDrawingHints="1" readOnly="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" simplifyLocal="1" simplifyMaxScale="1" simplifyDrawingTol="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" enableorderby="0" symbollevels="1" type="RuleRenderer">
+            <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 filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
               </rules>
               <symbols>
-                <symbol name="0" type="line" alpha="1" force_rhr="0" clip_to_extent="1">
-                  <layer enabled="1" class="SimpleLine" locked="0" 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 force_rhr="0" type="line" alpha="1" clip_to_extent="1" name="0">
+                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                    <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 name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8431,64 +8976,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.8" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="0" fontLetterSpacing="0" fontWordSpacing="0" fontSize="11" useSubstitutions="0" namedStyle="Regular" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="50" fieldName="comment" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="1" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="comment" fontUnderline="0" fontStrikeout="0" fontCapitals="0" isExpression="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" fontItalic="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.8" blendMode="0" previewBkgrdColor="#ffffff" namedStyle="Regular" useSubstitutions="0" fontSize="11" textColor="0,0,0,255">
+                      <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="0.6" shapeBorderColor="255,255,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0.6" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1"/>
+                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="2" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MM" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="5" placement="4" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000"/>
+                    <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" plussign="0" wrapChar="" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" formatNumbers="0"/>
+                    <placement geometryGenerator="" offsetType="0" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" repeatDistance="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" yOffset="0" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" centroidWhole="0" dist="5" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" quadOffset="4" repeatDistanceUnits="MM" xOffset="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" placement="4" rotationAngle="0" offsetUnits="MM"/>
+                    <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="1" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="1" minFeatureSize="0" zIndex="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                            <Option name="type" type="int" value="2"/>
+                        <Option value="" type="QString" 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>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                            <Option name="type" type="int" value="2"/>
+                          <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>
                         </Option>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="12" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="round( $length, 1) || 'm'" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
+                    <text-style fieldName="round( $length, 1) || 'm'" fontUnderline="0" fontStrikeout="0" fontCapitals="0" isExpression="1" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" fontItalic="0" fontFamily="Myriad Pro" fontWordSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" blendMode="0" previewBkgrdColor="#ffffff" namedStyle="Semibold" useSubstitutions="0" fontSize="12" textColor="0,0,0,255">
+                      <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRotation="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0"/>
+                      <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="4294967295"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="15" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MM" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="5" placement="2" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" displayAll="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                    <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" plussign="0" wrapChar="" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" formatNumbers="0"/>
+                    <placement geometryGenerator="" offsetType="0" priority="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" repeatDistance="0" preserveRotation="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" centroidInside="0" yOffset="0" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" centroidWhole="0" dist="1" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" quadOffset="4" repeatDistanceUnits="MM" xOffset="0" placementFlags="15" distMapUnitScale="3x:0,0,0,0,0,0" placement="2" rotationAngle="0" offsetUnits="MM"/>
+                    <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="0" minFeatureSize="0" zIndex="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" upsidedownLabels="0"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                            <Option name="type" type="int" value="2"/>
+                        <Option value="" type="QString" 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>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                            <Option name="type" type="int" value="2"/>
+                          <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>
                         </Option>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8504,18 +9049,18 @@ def my_form_open(dialog, layer, feature):
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" labelPlacementMethod="XHeight" minScaleDenominator="0" scaleBasedVisibility="0" penWidth="0" penColor="#000000" maxScaleDenominator="1e+08" width="15" penAlpha="255">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" scaleDependency="Area" lineSizeType="MM" sizeType="MM" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" width="15" penWidth="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" penAlpha="255" labelPlacementMethod="XHeight">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
                 <attribute field="" label="" color="#000000"/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" zIndex="0" placement="2" obstacle="0">
+            <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
               <properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
@@ -8603,45 +9148,45 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias field="id" name="" index="0"/>
-              <alias field="group" name="" index="1"/>
-              <alias field="comment" name="" index="2"/>
-              <alias field="moveable" name="" index="3"/>
-              <alias field="type" name="" index="4"/>
-              <alias field="name" name="" index="5"/>
-              <alias field="hidden" name="" index="6"/>
-              <alias field="auxiliary_storage_labeling_positiony" name="" index="7"/>
-              <alias field="auxiliary_storage_labeling_positionx" name="" index="8"/>
-              <alias field="fence_len" name="" index="9"/>
-              <alias field="cone_len" name="" index="10"/>
+              <alias index="0" 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 notnull_strength="0" constraints="0" field="id" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="group" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="comment" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="moveable" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="type" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="name" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="hidden" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+              <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="group" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="comment" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="moveable" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="hidden" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="fence_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+              <constraint field="cone_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint field="id" exp="" desc=""/>
@@ -8657,27 +9202,27 @@ def my_form_open(dialog, layer, feature):
               <constraint field="cone_len" exp="" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-              <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-              <field length="-1" subType="0" name="cone_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+              <field typeName="double precision" precision="0" type="6" length="-1" subType="0" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
+              <field typeName="double precision" precision="0" type="6" length="-1" subType="0" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
+              <field typeName="double precision" precision="0" type="6" length="-1" subType="0" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column name="id" width="-1" type="field" hidden="0"/>
-                <column name="group" width="-1" type="field" hidden="0"/>
-                <column width="-1" type="actions" hidden="1"/>
-                <column name="comment" width="223" type="field" hidden="0"/>
-                <column name="moveable" width="-1" type="field" hidden="0"/>
-                <column name="type" width="-1" type="field" hidden="0"/>
-                <column name="name" width="414" type="field" hidden="0"/>
-                <column name="hidden" width="-1" type="field" hidden="0"/>
-                <column name="fence_len" width="-1" type="field" hidden="0"/>
-                <column name="cone_len" width="-1" type="field" hidden="0"/>
-                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
-                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
+                <column hidden="0" type="field" width="-1" name="id"/>
+                <column hidden="0" type="field" width="-1" name="group"/>
+                <column hidden="1" type="actions" width="-1"/>
+                <column hidden="0" type="field" width="223" name="comment"/>
+                <column hidden="0" type="field" width="-1" name="moveable"/>
+                <column hidden="0" type="field" width="-1" name="type"/>
+                <column hidden="0" type="field" width="414" name="name"/>
+                <column hidden="0" type="field" width="-1" name="hidden"/>
+                <column hidden="0" type="field" width="-1" name="fence_len"/>
+                <column hidden="0" type="field" width="-1" name="cone_len"/>
+                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positiony"/>
+                <column hidden="1" type="field" width="-1" name="auxiliary_storage_labeling_positionx"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8708,32 +9253,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8750,58 +9295,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="133,182,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8832,36 +9377,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -8876,44 +9421,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="133,182,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="95,130,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8936,64 +9481,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="1" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="1" enableorderby="0">
         <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)')">
-            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')"/>
-            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
-            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
-            <rule symbol="3" checkstate="0" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone')" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr')" symbol="3" checkstate="0" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule symbol="4" checkstate="0" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="4" checkstate="0" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="1;4"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="Point"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dot"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="1;4" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="Point" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dot" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9024,56 +9569,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="4;3"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="round" type="QString" name="capstyle"/>
+                <Option value="4;3" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -9104,56 +9649,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9184,56 +9729,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0,255,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.8" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9264,56 +9809,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9344,50 +9889,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="5" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9418,9 +9963,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9429,34 +9974,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.80000000000000004" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="11" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="comment" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="comment" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="11" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeBorderWidth="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="1" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="255,255,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="1" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.6"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.6" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9471,110 +10016,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                        <Option name="type" type="int" value="2"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="5" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="14" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1.8200000000000001" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="5" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="14" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+              <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8200000000000001" scaleMax="0" mergeLines="1" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="11" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="round( $length, 1) || 'm'" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="round( $length, 1) || 'm'" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="11" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9589,88 +10134,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="1"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="1" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="6" xOffset="0" yOffset="0" placementFlags="14" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="14" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="6"/>
+              <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -9679,57 +10224,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -9760,9 +10308,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9770,12 +10318,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -9783,7 +10331,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -9851,37 +10399,37 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="group" name="" index="1"/>
-        <alias field="comment" name="" index="2"/>
-        <alias field="moveable" name="" index="3"/>
-        <alias field="type" name="" index="4"/>
-        <alias field="name" name="" index="5"/>
-        <alias field="hidden" name="" index="6"/>
-        <alias field="fence_len" name="" index="7"/>
-        <alias field="cone_len" name="" index="8"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="fence_len" name=""/>
+        <alias index="8" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default 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="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="fence_len" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="group" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="comment" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="moveable" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="hidden" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="fence_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="cone_len" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -9895,25 +10443,25 @@ def my_form_open(dialog, layer, feature):
         <constraint field="cone_len" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="fence_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-        <field length="-1" subType="0" name="cone_len" type="6" typeName="double precision" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" subType="0" comment=""/>
+        <field typeName="double precision" precision="0" type="6" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" subType="0" comment=""/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="group" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="comment" type="field" width="373" hidden="0"/>
-          <column name="moveable" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="692" hidden="0"/>
-          <column name="hidden" type="field" width="-1" hidden="0"/>
-          <column name="fence_len" type="field" width="-1" hidden="0"/>
-          <column name="cone_len" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="group" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="comment" width="373"/>
+          <column hidden="0" type="field" name="moveable" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="name" width="692"/>
+          <column hidden="0" type="field" name="hidden" width="-1"/>
+          <column hidden="0" type="field" name="fence_len" width="-1"/>
+          <column hidden="0" type="field" name="cone_len" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9945,32 +10493,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9978,7 +10526,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10051,58 +10599,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="164,113,88,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10133,36 +10681,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10177,44 +10725,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="164,113,88,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="117,81,63,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10237,54 +10785,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,178,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,178,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10315,9 +10863,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10328,57 +10876,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10409,9 +10960,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10419,12 +10970,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10432,7 +10983,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -10444,13 +10995,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10459,10 +11010,10 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10494,10 +11045,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10505,7 +11056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.94678832168284544</ymin>
@@ -10578,58 +11129,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="213,180,60,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10660,36 +11211,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -10704,44 +11255,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="213,180,60,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="152,129,43,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10764,38 +11315,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="26,0,201,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="dot"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="26,0,201,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="dot" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="b_diagonal" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -10810,9 +11361,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10823,57 +11374,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10904,9 +11458,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10914,18 +11468,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option value="" type="QString" 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>
             </Option>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -10933,15 +11487,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10950,8 +11504,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10960,27 +11514,27 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="page" name="" index="2"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
       </aliases>
       <defaults>
-        <default field="id" applyOnUpdate="0" expression=""/>
-        <default field="type" applyOnUpdate="0" expression=""/>
-        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="page" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -10991,12 +11545,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="page" type="field" width="-1" hidden="0"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="page" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11028,14 +11582,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11043,7 +11597,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -11108,7 +11662,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11119,7 +11673,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" memoryCache="1" customPrefix="csv_" cascadedDelete="0" editable="0" targetFieldName="position" hasCustomPrefix="1" upsertOnEdit="0" dynamicForm="0">
+        <join joinLayerId="marshals_by_position20161003112326575" customPrefix="csv_" joinFieldName="position" cascadedDelete="0" editable="0" targetFieldName="position" dynamicForm="0" upsertOnEdit="0" hasCustomPrefix="1" memoryCache="1">
           <joinFieldsSubset>
             <field name="club"/>
             <field name="name"/>
@@ -11145,58 +11699,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="114,155,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="114,155,111,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11227,36 +11781,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -11271,44 +11825,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="81,111,79,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11331,50 +11885,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule symbol="0" label="Show in marshal overview" description="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
-          <rule symbol="1" label="Show in marshal maps" description="Show in marshal overview" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' )"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="0" label="Show in marshal overview" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" symbol="1" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="0.792157" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="0.792157" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11397,42 +11951,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="marker" alpha="0.01" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="0.01" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.1" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11455,9 +12009,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11466,34 +12020,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{3100b6d3-183a-45b5-94f5-2ae25cc59226}">
-          <rule description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="6" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="6" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.1" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -11508,121 +12062,121 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="1" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="2" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="1" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="2" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{98b8f830-3256-405e-9a42-27279b9826d4}" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{98b8f830-3256-405e-9a42-27279b9826d4}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.5" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="6" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.5" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="6" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="0.5" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -11637,181 +12191,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option value="" type="QString" 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>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="8" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="5" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="8"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="5" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.59999999999999998" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="6" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.59999999999999998" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="6" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="0.59999999999999998" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -11826,181 +12380,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="8" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="5" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="8"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="5" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{85065de1-e51c-4c04-9292-536cbccc7aba}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{85065de1-e51c-4c04-9292-536cbccc7aba}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="position" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="position" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="8" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0.20000000000000001" shapeSizeY="0.20000000000000001" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.20000000000000001" shapeOpacity="0.90000000000000002" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeRadiiY="0">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,0,255" type="QString" name="color"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.4" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -12015,149 +12569,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <Option value="" type="QString" 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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="FontOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ObstacleFactor" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Priority" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ShapeOpacity" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="Size" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="ZIndex" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="10" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="10000000" mergeLines="0" obstacle="0" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="10" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="FontOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ObstacleFactor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Priority" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ShapeOpacity" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="Size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="ZIndex" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -12166,197 +12720,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="StringList">
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="StringList" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/angleOffset"/>
+          <Option value="0" type="QString" name="labeling/blendMode"/>
+          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
+          <Option value="255" type="QString" name="labeling/bufferColorA"/>
+          <Option value="255" type="QString" name="labeling/bufferColorB"/>
+          <Option value="255" type="QString" name="labeling/bufferColorG"/>
+          <Option value="255" type="QString" name="labeling/bufferColorR"/>
+          <Option value="false" type="QString" name="labeling/bufferDraw"/>
+          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
+          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
+          <Option value="1" type="QString" name="labeling/bufferSize"/>
+          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/bufferTransp"/>
+          <Option value="false" type="QString" name="labeling/centroidInside"/>
+          <Option value="false" type="QString" name="labeling/centroidWhole"/>
+          <Option value="3" type="QString" name="labeling/decimals"/>
+          <Option value="false" type="QString" name="labeling/displayAll"/>
+          <Option value="0" type="QString" name="labeling/dist"/>
+          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/drawLabels"/>
+          <Option value="false" type="QString" name="labeling/enabled"/>
+          <Option value="position" type="QString" name="labeling/fieldName"/>
+          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
+          <Option value="0" type="QString" name="labeling/fontCapitals"/>
+          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
+          <Option value="false" type="QString" name="labeling/fontItalic"/>
+          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
+          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
+          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
+          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
+          <Option value="10" type="QString" name="labeling/fontSize"/>
+          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
+          <Option value="false" type="QString" name="labeling/fontUnderline"/>
+          <Option value="63" type="QString" name="labeling/fontWeight"/>
+          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
+          <Option value="false" type="QString" name="labeling/formatNumbers"/>
+          <Option value="false" type="QString" name="labeling/isExpression"/>
+          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
+          <Option value="false" type="QString" name="labeling/labelPerPart"/>
+          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
+          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
+          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
+          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
+          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
+          <Option value="false" type="QString" name="labeling/mergeLines"/>
+          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
+          <Option value="0" type="QString" name="labeling/multilineAlign"/>
+          <Option value="1" type="QString" name="labeling/multilineHeight"/>
+          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
+          <Option value="true" type="QString" name="labeling/obstacle"/>
+          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
+          <Option value="0" type="QString" name="labeling/obstacleType"/>
+          <Option value="0" type="QString" name="labeling/offsetType"/>
+          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
+          <Option value="0" type="QString" name="labeling/placement"/>
+          <Option value="10" type="QString" name="labeling/placementFlags"/>
+          <Option value="false" type="QString" name="labeling/plussign"/>
+          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
+          <Option value="true" type="QString" name="labeling/preserveRotation"/>
+          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
+          <Option value="5" type="QString" name="labeling/priority"/>
+          <Option value="4" type="QString" name="labeling/quadOffset"/>
+          <Option value="0" type="QString" name="labeling/repeatDistance"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
+          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
+          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
+          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
+          <Option value="1" type="QString" name="labeling/scaleMin"/>
+          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
+          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
+          <Option value="0" type="QString" name="labeling/shadowColorB"/>
+          <Option value="0" type="QString" name="labeling/shadowColorG"/>
+          <Option value="0" type="QString" name="labeling/shadowColorR"/>
+          <Option value="false" type="QString" name="labeling/shadowDraw"/>
+          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
+          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
+          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
+          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
+          <Option value="100" type="QString" name="labeling/shadowScale"/>
+          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
+          <Option value="0" type="QString" name="labeling/shadowUnder"/>
+          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
+          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
+          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
+          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
+          <Option value="true" type="QString" name="labeling/shapeDraw"/>
+          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
+          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
+          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
+          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
+          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
+          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
+          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
+          <Option value="0" type="QString" name="labeling/shapeRotation"/>
+          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
+          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
+          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
+          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
+          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
+          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
+          <Option value="0" type="QString" name="labeling/shapeType"/>
+          <Option value="255" type="QString" name="labeling/textColorA"/>
+          <Option value="255" type="QString" name="labeling/textColorB"/>
+          <Option value="255" type="QString" name="labeling/textColorG"/>
+          <Option value="255" type="QString" name="labeling/textColorR"/>
+          <Option value="0" type="QString" name="labeling/textTransp"/>
+          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
+          <Option value="" type="QString" name="labeling/wrapChar"/>
+          <Option value="0" type="QString" name="labeling/xOffset"/>
+          <Option value="0" type="QString" name="labeling/yOffset"/>
+          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -12387,9 +12944,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12397,12 +12954,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -12410,15 +12967,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12427,8 +12984,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12437,8 +12994,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option value="false" type="bool" name="IsMultiline"/>
+                <Option value="false" type="bool" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12447,8 +13004,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12457,8 +13014,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12467,8 +13024,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12477,8 +13034,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -12520,46 +13077,46 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="position" name="" index="1"/>
-        <alias field="type" name="" index="2"/>
-        <alias field="notes" name="" index="3"/>
-        <alias field="xyposition" name="" index="4"/>
-        <alias field="csv_club" name="" index="5"/>
-        <alias field="csv_name" name="" index="6"/>
-        <alias field="csv_captain" name="" index="7"/>
-        <alias field="csv_captain_phone" name="" index="8"/>
-        <alias field="csv_first_runner" name="" index="9"/>
-        <alias field="csv_last_runner" name="" index="10"/>
-        <alias field="csv_instructions" name="" index="11"/>
+        <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="csv_club" name=""/>
+        <alias index="6" field="csv_name" name=""/>
+        <alias index="7" field="csv_captain" name=""/>
+        <alias index="8" field="csv_captain_phone" name=""/>
+        <alias index="9" field="csv_first_runner" name=""/>
+        <alias index="10" field="csv_last_runner" name=""/>
+        <alias index="11" 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="csv_club" applyOnUpdate="0" expression=""/>
-        <default field="csv_name" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain" applyOnUpdate="0" expression=""/>
-        <default field="csv_captain_phone" 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="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_name" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_phone" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="xyposition" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_first_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="position" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="notes" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="xyposition" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_club" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_captain_phone" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_first_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_last_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="csv_instructions" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -12579,21 +13136,21 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="position" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="notes" type="field" width="-1" hidden="0"/>
-          <column name="xyposition" type="field" width="-1" hidden="0"/>
-          <column name="csv_name" type="field" width="-1" hidden="0"/>
-          <column name="csv_club" type="field" width="-1" hidden="0"/>
-          <column name="csv_captain" type="field" width="-1" hidden="0"/>
-          <column name="csv_captain_phone" type="field" width="-1" hidden="0"/>
-          <column name="csv_first_runner" type="field" width="-1" hidden="0"/>
-          <column name="csv_last_runner" type="field" width="-1" hidden="0"/>
-          <column name="csv_instructions" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="position" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="notes" width="-1"/>
+          <column hidden="0" type="field" name="xyposition" width="-1"/>
+          <column hidden="0" type="field" name="csv_name" width="-1"/>
+          <column hidden="0" type="field" name="csv_club" width="-1"/>
+          <column hidden="0" type="field" name="csv_captain" width="-1"/>
+          <column hidden="0" type="field" name="csv_captain_phone" width="-1"/>
+          <column hidden="0" type="field" name="csv_first_runner" width="-1"/>
+          <column hidden="0" type="field" name="csv_last_runner" width="-1"/>
+          <column hidden="0" type="field" name="csv_instructions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12625,70 +13182,70 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_firstname" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="csv_surname" editable="0"/>
-        <field name="id" editable="1"/>
-        <field name="notes" editable="1"/>
-        <field name="oldpositio" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="xyposition" editable="1"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="0" name="csv_firstname"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="0" name="csv_surname"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="notes"/>
+        <field editable="1" name="oldpositio"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12739,7 +13296,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" minScale="1e+08" refreshOnNotifyMessage="" geometry="No geometry" maxScale="100000" type="vector" autoRefreshEnabled="0" wkbType="NoGeometry" readOnly="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" legendPlaceholderImage="">
+    <maplayer maxScale="100000" minScale="1e+08" readOnly="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" type="vector" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" wkbType="NoGeometry" geometry="No geometry" autoRefreshTime="0" refreshOnNotifyMessage="">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12792,7 +13349,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -12820,58 +13377,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="243,166,178,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="243,166,178,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12902,36 +13459,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -12946,44 +13503,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="243,166,178,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="174,119,127,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13006,9 +13563,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13017,25 +13574,28 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="first_name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13044,8 +13604,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13068,8 +13628,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13078,8 +13638,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13088,8 +13648,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13098,8 +13658,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13122,8 +13682,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13151,52 +13711,52 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="position" name="" index="0"/>
-        <alias field="club" name="" index="1"/>
-        <alias field="firstname" name="" index="2"/>
-        <alias field="surname" name="" index="3"/>
-        <alias field="name" name="" index="4"/>
-        <alias field="phone" name="" index="5"/>
-        <alias field="email" name="" index="6"/>
-        <alias field="captain" name="" index="7"/>
-        <alias field="captain_phone" name="" index="8"/>
-        <alias field="captain_email" name="" index="9"/>
-        <alias field="races" name="" index="10"/>
-        <alias field="first_runner" name="" index="11"/>
-        <alias field="last_runner" name="" index="12"/>
-        <alias field="instructions" name="" index="13"/>
+        <alias index="0" field="position" name=""/>
+        <alias index="1" field="club" name=""/>
+        <alias index="2" field="firstname" name=""/>
+        <alias index="3" field="surname" name=""/>
+        <alias index="4" field="name" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="captain_email" name=""/>
+        <alias index="10" field="races" name=""/>
+        <alias index="11" field="first_runner" name=""/>
+        <alias index="12" field="last_runner" name=""/>
+        <alias index="13" field="instructions" name=""/>
       </aliases>
       <defaults>
-        <default field="position" applyOnUpdate="0" expression=""/>
-        <default field="club" applyOnUpdate="0" expression=""/>
-        <default field="firstname" applyOnUpdate="0" expression=""/>
-        <default field="surname" applyOnUpdate="0" expression=""/>
-        <default field="name" applyOnUpdate="0" expression=""/>
-        <default field="phone" applyOnUpdate="0" expression=""/>
-        <default field="email" applyOnUpdate="0" expression=""/>
-        <default field="captain" applyOnUpdate="0" expression=""/>
-        <default field="captain_phone" applyOnUpdate="0" expression=""/>
-        <default field="captain_email" applyOnUpdate="0" expression=""/>
-        <default field="races" applyOnUpdate="0" expression=""/>
-        <default field="first_runner" applyOnUpdate="0" expression=""/>
-        <default field="last_runner" applyOnUpdate="0" expression=""/>
-        <default field="instructions" applyOnUpdate="0" expression=""/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="firstname" expression="" applyOnUpdate="0"/>
+        <default field="surname" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="phone" expression="" applyOnUpdate="0"/>
+        <default field="email" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="captain_email" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="firstname" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="surname" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain_email" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
+        <constraint field="position" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="club" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="firstname" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="surname" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="phone" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="email" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain_phone" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="captain_email" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="races" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runner" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="instructions" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="position" exp="" desc=""/>
@@ -13218,23 +13778,23 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="position" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="221" hidden="0"/>
-          <column name="club" type="field" width="-1" hidden="0"/>
-          <column name="phone" type="field" width="-1" hidden="0"/>
-          <column name="email" type="field" width="-1" hidden="0"/>
-          <column name="captain" type="field" width="-1" hidden="0"/>
-          <column name="races" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="first_runner" type="field" width="-1" hidden="0"/>
-          <column name="last_runner" type="field" width="-1" hidden="0"/>
-          <column name="instructions" type="field" width="-1" hidden="0"/>
-          <column name="firstname" type="field" width="-1" hidden="0"/>
-          <column name="surname" type="field" width="-1" hidden="0"/>
-          <column name="captain_phone" type="field" width="-1" hidden="0"/>
-          <column name="captain_email" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="position" width="-1"/>
+          <column hidden="0" type="field" name="name" width="221"/>
+          <column hidden="0" type="field" name="club" width="-1"/>
+          <column hidden="0" type="field" name="phone" width="-1"/>
+          <column hidden="0" type="field" name="email" width="-1"/>
+          <column hidden="0" type="field" name="captain" width="-1"/>
+          <column hidden="0" type="field" name="races" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="first_runner" width="-1"/>
+          <column hidden="0" type="field" name="last_runner" width="-1"/>
+          <column hidden="0" type="field" name="instructions" width="-1"/>
+          <column hidden="0" type="field" name="firstname" width="-1"/>
+          <column hidden="0" type="field" name="surname" width="-1"/>
+          <column hidden="0" type="field" name="captain_phone" width="-1"/>
+          <column hidden="0" type="field" name="captain_email" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13266,42 +13826,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13309,7 +13869,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13374,7 +13934,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13399,58 +13959,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="141,90,153,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="141,90,153,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13481,36 +14041,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -13525,44 +14085,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="141,90,153,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="101,64,109,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13585,58 +14145,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13667,50 +14227,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -13741,30 +14301,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -13784,33 +14344,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -13826,32 +14386,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -13866,9 +14426,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13881,57 +14441,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13962,9 +14525,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13972,12 +14535,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -13985,7 +14548,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -14004,16 +14567,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -14023,11 +14586,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14059,12 +14622,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14072,7 +14635,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14137,7 +14700,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14162,58 +14725,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="232,113,141,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="232,113,141,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14244,36 +14807,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -14288,44 +14851,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="232,113,141,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="166,81,101,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14348,44 +14911,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.75" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8.5" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="name" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="name" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.75" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="8.5" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1.5" bufferDraw="1" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="0.59999999999999998" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1.5" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -14400,155 +14963,158 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option value="" type="QString" 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>
-                  <Option name="PositionX" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_x"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="PositionY" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_y"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="Size" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
                 </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="1" xOffset="0" yOffset="0" placementFlags="2" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="0.20000000000000001" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="2" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="1"/>
+          <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="0.20000000000000001" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="Size" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -14579,9 +15145,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14589,12 +15155,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -14602,15 +15168,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14619,8 +15185,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14629,8 +15195,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14639,8 +15205,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14649,8 +15215,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14659,8 +15225,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14669,8 +15235,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14679,8 +15245,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -14689,45 +15255,45 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="osm_id" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="type" name="" index="3"/>
-        <alias field="z_order" name="" index="4"/>
-        <alias field="population" name="" index="5"/>
-        <alias field="label_x" name="" index="6"/>
-        <alias field="label_y" name="" index="7"/>
-        <alias field="label_rota" name="" index="8"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="osm_id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="population" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -14744,18 +15310,18 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="osm_id" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column name="z_order" type="field" width="-1" hidden="0"/>
-          <column name="population" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="label_x" type="field" width="-1" hidden="0"/>
-          <column name="label_y" type="field" width="-1" hidden="0"/>
-          <column name="label_rota" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="osm_id" width="-1"/>
+          <column hidden="0" type="field" name="name" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="0" type="field" name="z_order" width="-1"/>
+          <column hidden="0" type="field" name="population" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="label_x" width="-1"/>
+          <column hidden="0" type="field" name="label_y" width="-1"/>
+          <column hidden="0" type="field" name="label_rota" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14787,26 +15353,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14814,7 +15380,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14879,7 +15445,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14904,58 +15470,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,158,23,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,158,23,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14986,36 +15552,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -15030,44 +15596,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="255,158,23,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="182,113,16,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -15090,44 +15656,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.80000000000000004" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="7" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.80000000000000004" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="7" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="0.59999999999999998" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -15142,195 +15708,201 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="AlwaysShow" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="always_sho"/>
-                    <Option name="type" type="int" value="2"/>
+                <Option value="" type="QString" 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>
-                  <Option name="IsObstacle" type="Map">
-                    <Option name="active" type="bool" value="false"/>
-                    <Option name="expression" type="QString" value="&quot;&quot;"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
-                  <Option name="PositionX" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_x"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="PositionY" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_y"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="Priority" type="Map">
-                    <Option name="active" type="bool" value="false"/>
-                    <Option name="type" type="int" value="1"/>
-                    <Option name="val" type="QString" value=""/>
+                  <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>
-                  <Option name="Show" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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>
-                  <Option name="Size" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
                 </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="0"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MapUnit" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="3" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="3" xOffset="0" yOffset="0" placementFlags="4" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="5" obstacleFactor="0.29999999999999999" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="3" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="4" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="3"/>
+          <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="0.29999999999999999" scaleMax="10000000" mergeLines="1" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="5" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="always_sho"/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="IsObstacle" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="&quot;&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="PositionX" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="PositionY" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="Priority" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
-                <Option name="Show" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="Size" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+          </Option>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15361,9 +15933,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15371,12 +15943,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -15384,15 +15956,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15401,8 +15973,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15446,8 +16018,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15510,58 +16082,58 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="osm_id" name="" index="0"/>
-        <alias field="name" name="" index="1"/>
-        <alias field="highway" name="" index="2"/>
-        <alias field="waterway" name="" index="3"/>
-        <alias field="aerialway" name="" index="4"/>
-        <alias field="barrier" name="" index="5"/>
-        <alias field="man_made" name="" index="6"/>
-        <alias field="z_order" name="" index="7"/>
-        <alias field="other_tags" name="" index="8"/>
-        <alias field="never_show" name="" index="9"/>
-        <alias field="label_x" name="" index="10"/>
-        <alias field="label_y" name="" index="11"/>
-        <alias field="label_rota" name="" index="12"/>
-        <alias field="always_sho" name="" index="13"/>
-        <alias field="resident_a" name="" index="14"/>
-        <alias field="auxiliary_storage_labeling_show" name="" index="15"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0"/>
+        <constraint field="osm_id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="highway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="waterway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="aerialway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="barrier" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="man_made" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="z_order" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="other_tags" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="never_show" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_x" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_y" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label_rota" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="always_sho" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="resident_a" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="auxiliary_storage_labeling_show" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="osm_id" exp="" desc=""/>
@@ -15585,25 +16157,25 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;resident_a&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;auxiliary_storage_labeling_show&quot;">
         <columns>
-          <column name="osm_id" type="field" width="-1" hidden="0"/>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="z_order" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="highway" type="field" width="-1" hidden="0"/>
-          <column name="waterway" type="field" width="-1" hidden="0"/>
-          <column name="aerialway" type="field" width="-1" hidden="0"/>
-          <column name="barrier" type="field" width="-1" hidden="0"/>
-          <column name="man_made" type="field" width="-1" hidden="0"/>
-          <column name="other_tags" type="field" width="-1" hidden="0"/>
-          <column name="never_show" type="field" width="-1" hidden="0"/>
-          <column name="label_x" type="field" width="-1" hidden="0"/>
-          <column name="label_y" type="field" width="-1" hidden="0"/>
-          <column name="label_rota" type="field" width="-1" hidden="0"/>
-          <column name="always_sho" type="field" width="-1" hidden="0"/>
-          <column name="resident_a" type="field" width="-1" hidden="0"/>
-          <column name="auxiliary_storage_labeling_show" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="osm_id" width="-1"/>
+          <column hidden="0" type="field" name="name" width="160"/>
+          <column hidden="0" type="field" name="z_order" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="highway" width="-1"/>
+          <column hidden="0" type="field" name="waterway" width="-1"/>
+          <column hidden="0" type="field" name="aerialway" width="-1"/>
+          <column hidden="0" type="field" name="barrier" width="-1"/>
+          <column hidden="0" type="field" name="man_made" width="-1"/>
+          <column hidden="0" type="field" name="other_tags" width="142"/>
+          <column hidden="0" type="field" name="never_show" width="-1"/>
+          <column hidden="0" type="field" name="label_x" width="-1"/>
+          <column hidden="0" type="field" name="label_y" width="-1"/>
+          <column hidden="0" type="field" name="label_rota" width="-1"/>
+          <column hidden="0" type="field" name="always_sho" width="-1"/>
+          <column hidden="0" type="field" name="resident_a" width="-1"/>
+          <column hidden="0" type="field" name="auxiliary_storage_labeling_show" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15635,76 +16207,76 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -15755,7 +16327,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15820,7 +16392,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15845,58 +16417,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="231,113,72,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="231,113,72,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -15927,36 +16499,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -15971,44 +16543,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="231,113,72,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="165,81,51,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16031,54 +16603,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="name" type="QString" value="star"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.5"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="star" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.5" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16101,47 +16673,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,32,80,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="0,32,80,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="7" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -16163,47 +16735,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -16225,57 +16797,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/road_closure.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="../images/road_closure.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -16297,47 +16869,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,12,254,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="255,255,255,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="0,12,254,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="255,255,255,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -16357,21 +16929,21 @@ def my_form_open(dialog, layer, feature):
               <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="size_unit" v="MM"/>
               <prop k="vertical_anchor_point" v="1"/>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -16388,24 +16960,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -16428,10 +17000,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="1" type="QString" name="enabled"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -16440,18 +17012,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option value="13" type="QString" name="blend_mode"/>
+                    <Option value="2.645" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,0,255" type="QString" name="color"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="135" type="QString" name="offset_angle"/>
+                    <Option value="2" type="QString" name="offset_distance"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
+                    <Option value="1" type="QString" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -16468,24 +17040,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option value="0" type="QString" name="blend_mode"/>
+                    <Option value="0.7935" type="QString" name="blur_level"/>
+                    <Option value="MM" type="QString" name="blur_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
+                    <Option value="0,0,255,255" type="QString" name="color1"/>
+                    <Option value="0,255,0,255" type="QString" name="color2"/>
+                    <Option value="0" type="QString" name="color_type"/>
+                    <Option value="ccw" type="QString" name="direction"/>
+                    <Option value="0" type="QString" name="discrete"/>
+                    <Option value="2" type="QString" name="draw_mode"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="0.5" type="QString" name="opacity"/>
+                    <Option value="gradient" type="QString" name="rampType"/>
+                    <Option value="255,255,255,255" type="QString" name="single_color"/>
+                    <Option value="rgb" type="QString" name="spec"/>
+                    <Option value="2" type="QString" name="spread"/>
+                    <Option value="MM" type="QString" name="spread_unit"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -16509,47 +17081,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="5" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="43,153,41,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="43,153,41,255" type="QString" name="color"/>
+                <Option value="0" type="QString" name="fixedAspectRatio"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="6" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -16571,15 +17143,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16588,32 +17160,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="name" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="name" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="2" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="2" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="2" shapeSizeX="1" shapeSizeY="1" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="0.80000000000000004" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="2" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="0.69999999999999996" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="1" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="2">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -16628,145 +17200,148 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option value="" type="QString" 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>
-                  <Option name="OffsetQuad" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="2"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
-                  <Option name="Size" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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>
                 </Option>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="2" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="3" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="2" yOffset="3" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1.8" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="10" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="3" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="2" offsetType="0" centroidInside="0" quadOffset="2" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="3" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1.8" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="10" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="OffsetQuad" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="2"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="Size" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -16797,9 +17372,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16807,12 +17382,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -16820,7 +17395,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -16853,22 +17428,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="name" name="" index="2"/>
-        <alias field="distance" name="" index="3"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -16880,13 +17455,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="name" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="name" width="-1"/>
+          <column hidden="0" type="field" name="distance" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16918,16 +17493,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16935,7 +17510,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -17008,58 +17583,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="152,125,183,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17090,36 +17665,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -17134,44 +17709,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="152,125,183,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="109,89,131,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17194,42 +17769,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="135"/>
-                <Option name="clip_mode" type="QString" value="during_render"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="coordinate_reference" type="QString" value="feature"/>
-                <Option name="distance" type="QString" value="2"/>
-                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="distance_unit" type="QString" value="MM"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option value="135" type="QString" name="angle"/>
+                <Option value="during_render" type="QString" name="clip_mode"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="feature" type="QString" name="coordinate_reference"/>
+                <Option value="2" type="QString" name="distance"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
+                <Option value="MM" type="QString" name="distance_unit"/>
+                <Option value="0.26" type="QString" name="line_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -17248,48 +17823,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@0@0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                   <Option type="Map">
-                    <Option name="align_dash_pattern" type="QString" value="0"/>
-                    <Option name="capstyle" type="QString" value="square"/>
-                    <Option name="customdash" type="QString" value="5;2"/>
-                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="customdash_unit" type="QString" value="MM"/>
-                    <Option name="dash_pattern_offset" type="QString" value="0"/>
-                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                    <Option name="draw_inside_polygon" type="QString" value="0"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="line_color" type="QString" value="211,134,33,255"/>
-                    <Option name="line_style" type="QString" value="solid"/>
-                    <Option name="line_width" type="QString" value="0.3"/>
-                    <Option name="line_width_unit" type="QString" value="MM"/>
-                    <Option name="offset" type="QString" value="0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="ring_filter" type="QString" value="0"/>
-                    <Option name="trim_distance_end" type="QString" value="0"/>
-                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                    <Option name="trim_distance_start" type="QString" value="0"/>
-                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                    <Option name="use_custom_dash" type="QString" value="0"/>
-                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option value="0" type="QString" name="align_dash_pattern"/>
+                    <Option value="square" type="QString" name="capstyle"/>
+                    <Option value="5;2" type="QString" name="customdash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="customdash_unit"/>
+                    <Option value="0" type="QString" name="dash_pattern_offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                    <Option value="0" type="QString" name="draw_inside_polygon"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="211,134,33,255" type="QString" name="line_color"/>
+                    <Option value="solid" type="QString" name="line_style"/>
+                    <Option value="0.3" type="QString" name="line_width"/>
+                    <Option value="MM" type="QString" name="line_width_unit"/>
+                    <Option value="0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0" type="QString" name="ring_filter"/>
+                    <Option value="0" type="QString" name="trim_distance_end"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                    <Option value="0" type="QString" name="trim_distance_start"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                    <Option value="0" type="QString" name="use_custom_dash"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -17320,27 +17895,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 name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.46"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="no"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="211,134,33,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.46" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="no" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -17355,9 +17930,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17368,57 +17943,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17449,9 +18027,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17459,12 +18037,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="1">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -17472,7 +18050,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="FID" configurationFlags="None">
@@ -17484,13 +18062,13 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="FID" name="" index="0"/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <defaults>
-        <default field="FID" applyOnUpdate="0" expression=""/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="FID" exp_strength="0" unique_strength="0"/>
+        <constraint field="FID" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="FID" exp="" desc=""/>
@@ -17499,11 +18077,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="431" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17535,12 +18113,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17548,7 +18126,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17613,7 +18191,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17638,58 +18216,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,207,80,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,207,80,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17720,36 +18298,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -17764,44 +18342,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,207,80,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,148,57,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17824,61 +18402,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17909,50 +18487,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="2"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="2" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -17972,40 +18550,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="1"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="circle" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0.5" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="1" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18028,52 +18606,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="2" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="2;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash dot dot"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="2;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash dot dot" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18104,41 +18682,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18158,46 +18736,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@2@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18220,58 +18798,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="3" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="3;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="3;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,255,0,255" type="QString" name="line_color"/>
+                <Option value="dash" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18302,41 +18880,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="250" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="25" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="Interval" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -18356,46 +18934,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@3@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@3@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="square" type="QString" name="cap_style"/>
+                    <Option value="0,255,0,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                    <Option value="solid" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="3.5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18418,58 +18996,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="4" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="255,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.75" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18500,20 +19078,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 name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -18522,32 +19100,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="9" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Regular" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" fieldName="times" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="times" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Regular" useSubstitutions="0" fontSize="9" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18562,113 +19140,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="4294967295"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18699,9 +19280,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18709,12 +19290,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -18722,7 +19303,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -18755,22 +19336,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
-        <alias field="status" name="" index="2"/>
-        <alias field="times" name="" index="3"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="status" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="times" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -18782,13 +19363,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="type" type="field" width="202" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="status" type="field" width="-1" hidden="0"/>
-          <column name="times" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="type" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="status" width="-1"/>
+          <column hidden="0" type="field" name="times" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18820,16 +19401,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18837,25 +19418,25 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="100000" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
-        <xmin>18.37564632736778236</xmin>
-        <ymin>-33.94557692503335744</ymin>
-        <xmax>18.41938719291285409</xmax>
-        <ymax>-33.90033791158612075</ymax>
+        <xmin>18.37541576228521834</xmin>
+        <ymin>-33.95567171312350752</ymin>
+        <xmax>18.42201008438910748</xmax>
+        <ymax>-33.90011331441002085</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37564632736778236</xmin>
-        <ymin>-33.94557692503335744</ymin>
-        <xmax>18.41938719291285409</xmax>
-        <ymax>-33.90033791158612075</ymax>
+        <xmin>18.37541576228521834</xmin>
+        <ymin>-33.95567171312350752</ymin>
+        <xmax>18.42201008438910748</xmax>
+        <ymax>-33.90011331441002085</ymax>
       </wgs84extent>
-      <id>route_markers_137272a0_69df_47f0_82f8_521b9f4bef83</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
+      <id>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
-      <layername>route markers</layername>
+      <layername>route_markers</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
           <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -18902,7 +19483,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18911,1652 +19492,6 @@ def my_form_open(dialog, layer, feature):
           </temporal>
         </extent>
       </resourceMetadata>
-      <provider encoding="UTF-8">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-        <map-layer-style name="timelapse">
-          <qgis simplifyAlgorithm="0" minScale="1e+08" maxScale="100000" simplifyMaxScale="1" simplifyLocal="1" simplifyDrawingHints="0" readOnly="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" labelsEnabled="1">
-            <flags>
-              <Identifiable>1</Identifiable>
-              <Removable>1</Removable>
-              <Searchable>1</Searchable>
-            </flags>
-            <renderer-v2 type="nullSymbol"/>
-            <labeling type="rule-based">
-              <rules key="{2cf820d0-73b9-4746-94f0-ade0b2da8c4e}">
-                <rule description="21KM" key="{84988b39-de25-471d-aa1f-8d688cc3c1cd}" filter="&quot;Source&quot; = '21KM'">
-                  <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="7" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRadiiY="0.1" shapeSizeX="0.5" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
-                      <substitutions/>
-                    </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="3"/>
-                    <placement repeatDistance="0" quadOffset="3" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="10" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MapUnit" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="10" placement="6" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                    <dd_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PredefinedPositionOrder" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="Rotation" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="field" type="QString" value="rotation"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                        </Option>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </dd_properties>
-                  </settings>
-                </rule>
-                <rule description="10KM" key="{2699b0bb-7177-40de-af85-7bce9fd38af9}" filter="&quot;Source&quot; = '10KM'">
-                  <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="7" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRadiiY="0.1" shapeSizeX="0.5" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
-                      <substitutions/>
-                    </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="3"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="10" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MapUnit" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="10" placement="6" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                    <dd_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PredefinedPositionOrder" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="quadrant"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                          <Option name="Rotation" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="field" type="QString" value="rotation"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                        </Option>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </dd_properties>
-                  </settings>
-                </rule>
-                <rule description="5KM" key="{63d03041-a1e4-4dad-ab41-9339e48044c5}" filter="&quot;Source&quot; = '5KM'">
-                  <settings>
-                    <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" isExpression="1" fontLetterSpacing="0" fontWordSpacing="0" fontSize="7" useSubstitutions="0" namedStyle="Semibold" blendMode="0" previewBkgrdColor="#ffffff" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0">
-                      <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferOpacity="1"/>
-                      <background shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRadiiY="0.1" shapeSizeX="0.5" shapeSizeY="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeOffsetX="0" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeOffsetY="0" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowDraw="0" shadowColor="0,0,0,255" shadowRadiusUnit="MM"/>
-                      <substitutions/>
-                    </text-style>
-                    <text-format plussign="0" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" multilineAlign="3"/>
-                    <placement repeatDistance="0" quadOffset="4" rotationAngle="0" centroidInside="0" centroidWhole="0" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" geometryGeneratorType="PointGeometry" placementFlags="10" distUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" offsetUnits="MapUnit" yOffset="0" repeatDistanceUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" preserveRotation="1" priority="10" placement="6" geometryGenerator=""/>
-                    <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" displayAll="1" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                    <dd_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PositionY" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="type" type="int" value="1"/>
-                            <Option name="val" type="QString" value=""/>
-                          </Option>
-                          <Option name="PredefinedPositionOrder" type="Map">
-                            <Option name="active" type="bool" value="true"/>
-                            <Option name="field" type="QString" value="quadrant"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                          <Option name="Rotation" type="Map">
-                            <Option name="active" type="bool" value="false"/>
-                            <Option name="field" type="QString" value="rotation"/>
-                            <Option name="type" type="int" value="2"/>
-                          </Option>
-                        </Option>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </dd_properties>
-                  </settings>
-                </rule>
-              </rules>
-            </labeling>
-            <customproperties>
-              <property value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
-              <property key="variableNames"/>
-              <property key="variableValues"/>
-            </customproperties>
-            <blendMode>0</blendMode>
-            <featureBlendMode>0</featureBlendMode>
-            <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" labelPlacementMethod="XHeight" minScaleDenominator="100000" scaleBasedVisibility="0" penWidth="0" penColor="#000000" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-                <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" label="" color="#000000"/>
-              </DiagramCategory>
-            </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" zIndex="0" placement="0" obstacle="0">
-              <properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </properties>
-            </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-              <activeChecks/>
-              <checkConfiguration/>
-            </geometryOptions>
-            <fieldConfiguration>
-              <field name="Name">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="descriptio">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="timestamp">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="begin">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="end">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="Distance">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="RouteLen">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="Source">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="length_m">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="length_km">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="org_fid">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-              <field name="distance">
-                <editWidget type="TextEdit">
-                  <config>
-                    <Option type="Map">
-                      <Option name="IsMultiline" type="QString" value="0"/>
-                      <Option name="UseHtml" type="QString" value="0"/>
-                    </Option>
-                  </config>
-                </editWidget>
-              </field>
-            </fieldConfiguration>
-            <aliases>
-              <alias field="Name" name="" index="0"/>
-              <alias field="descriptio" name="" index="1"/>
-              <alias field="timestamp" name="" index="2"/>
-              <alias field="begin" name="" index="3"/>
-              <alias field="end" name="" index="4"/>
-              <alias field="Distance" name="" index="5"/>
-              <alias field="RouteLen" name="" index="6"/>
-              <alias field="Source" name="" index="7"/>
-              <alias field="length_m" name="" index="8"/>
-              <alias field="length_km" name="" index="9"/>
-              <alias field="org_fid" name="" index="10"/>
-              <alias field="distance" name="" index="11"/>
-            </aliases>
-            <excludeAttributesWMS/>
-            <excludeAttributesWFS/>
-            <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="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=""/>
-            </defaults>
-            <constraints>
-              <constraint notnull_strength="0" constraints="0" field="Name" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="begin" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="end" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="Distance" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="Source" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="length_m" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="length_km" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-              <constraint notnull_strength="0" constraints="0" field="distance" exp_strength="0" unique_strength="0"/>
-            </constraints>
-            <constraintExpressions>
-              <constraint field="Name" exp="" desc=""/>
-              <constraint field="descriptio" exp="" desc=""/>
-              <constraint field="timestamp" exp="" desc=""/>
-              <constraint field="begin" exp="" desc=""/>
-              <constraint field="end" exp="" desc=""/>
-              <constraint field="Distance" exp="" desc=""/>
-              <constraint field="RouteLen" exp="" desc=""/>
-              <constraint field="Source" exp="" desc=""/>
-              <constraint field="length_m" exp="" desc=""/>
-              <constraint field="length_km" exp="" desc=""/>
-              <constraint field="org_fid" exp="" desc=""/>
-              <constraint field="distance" exp="" desc=""/>
-            </constraintExpressions>
-            <expressionfields/>
-            <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-            </attributeactions>
-            <attributetableconfig sortOrder="1" sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown">
-              <columns>
-                <column width="-1" type="actions" hidden="1"/>
-                <column name="org_fid" width="-1" type="field" hidden="0"/>
-                <column name="distance" width="-1" type="field" hidden="0"/>
-                <column name="Name" width="-1" type="field" hidden="0"/>
-                <column name="Source" width="-1" type="field" hidden="0"/>
-                <column name="RouteLen" width="-1" type="field" hidden="0"/>
-                <column name="descriptio" width="-1" type="field" hidden="0"/>
-                <column name="timestamp" width="-1" type="field" hidden="0"/>
-                <column name="begin" width="-1" type="field" hidden="0"/>
-                <column name="end" width="-1" type="field" hidden="0"/>
-                <column name="Distance" width="-1" type="field" hidden="0"/>
-                <column name="length_km" width="-1" type="field" hidden="0"/>
-                <column name="length_m" width="-1" type="field" hidden="0"/>
-              </columns>
-            </attributetableconfig>
-            <conditionalstyles>
-              <rowstyles/>
-              <fieldstyles/>
-            </conditionalstyles>
-            <editform tolerant="1"/>
-            <editforminit/>
-            <editforminitcodesource>0</editforminitcodesource>
-            <editforminitfilepath>/home/tim/Documents/Projects/2019/Gun Run/Maps/GIS Base Map</editforminitfilepath>
-            <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-            <featformsuppress>0</featformsuppress>
-            <editorlayout>generatedlayout</editorlayout>
-            <editable>
-              <field name="Distance" editable="1"/>
-              <field name="Name" editable="1"/>
-              <field name="RouteLen" editable="1"/>
-              <field name="Source" editable="1"/>
-              <field name="begin" editable="1"/>
-              <field name="descriptio" editable="1"/>
-              <field name="distance" editable="1"/>
-              <field name="end" editable="1"/>
-              <field name="length_km" editable="1"/>
-              <field name="length_m" editable="1"/>
-              <field name="org_fid" editable="1"/>
-              <field name="quadrant" editable="1"/>
-              <field name="timestamp" editable="1"/>
-            </editable>
-            <labelOnTop>
-              <field name="Distance" labelOnTop="0"/>
-              <field name="Name" labelOnTop="0"/>
-              <field name="RouteLen" labelOnTop="0"/>
-              <field name="Source" labelOnTop="0"/>
-              <field name="begin" labelOnTop="0"/>
-              <field name="descriptio" labelOnTop="0"/>
-              <field name="distance" labelOnTop="0"/>
-              <field name="end" labelOnTop="0"/>
-              <field name="length_km" labelOnTop="0"/>
-              <field name="length_m" labelOnTop="0"/>
-              <field name="org_fid" labelOnTop="0"/>
-              <field name="quadrant" labelOnTop="0"/>
-              <field name="timestamp" labelOnTop="0"/>
-            </labelOnTop>
-            <widgets/>
-            <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-            <mapTip>Text</mapTip>
-            <layerGeometryType>0</layerGeometryType>
-          </qgis>
-        </map-layer-style>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-              <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <prop k="align_dash_pattern" v="0"/>
-              <prop k="capstyle" v="square"/>
-              <prop k="customdash" v="5;2"/>
-              <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="customdash_unit" v="MM"/>
-              <prop k="dash_pattern_offset" v="0"/>
-              <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="dash_pattern_offset_unit" v="MM"/>
-              <prop k="draw_inside_polygon" v="0"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="line_color" v="225,89,137,255"/>
-              <prop k="line_style" v="solid"/>
-              <prop k="line_width" v="0.6"/>
-              <prop k="line_width_unit" v="MM"/>
-              <prop k="offset" v="0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="ring_filter" v="0"/>
-              <prop k="trim_distance_end" v="0"/>
-              <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_end_unit" v="MM"/>
-              <prop k="trim_distance_start" v="0"/>
-              <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="trim_distance_start_unit" v="MM"/>
-              <prop k="tweak_dash_pattern_on_corners" v="0"/>
-              <prop k="use_custom_dash" v="0"/>
-              <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-              <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
-              </Option>
-              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="style" v="solid"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-              <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
-              </Option>
-              <prop k="angle" v="0"/>
-              <prop k="cap_style" v="square"/>
-              <prop k="color" v="225,89,137,255"/>
-              <prop k="horizontal_anchor_point" v="1"/>
-              <prop k="joinstyle" v="bevel"/>
-              <prop k="name" v="diamond"/>
-              <prop k="offset" v="0,0"/>
-              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="offset_unit" v="MM"/>
-              <prop k="outline_color" v="161,64,98,255"/>
-              <prop k="outline_style" v="solid"/>
-              <prop k="outline_width" v="0.2"/>
-              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="outline_width_unit" v="MM"/>
-              <prop k="scale_method" v="diameter"/>
-              <prop k="size" v="3"/>
-              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-              <prop k="size_unit" v="MM"/>
-              <prop k="vertical_anchor_point" v="1"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
-      <labeling type="rule-based">
-        <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
-          <rule description="Active routes" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                      <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
-                      </Option>
-                      <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="color" v="0,0,0,255"/>
-                      <prop k="joinstyle" v="round"/>
-                      <prop k="offset" v="0,0"/>
-                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                      <prop k="offset_unit" v="MM"/>
-                      <prop k="outline_color" v="0,0,0,255"/>
-                      <prop k="outline_style" v="solid"/>
-                      <prop k="outline_width" v="1"/>
-                      <prop k="outline_width_unit" v="MM"/>
-                      <prop k="style" v="solid"/>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule description="List for legends" active="0" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule description="21KM" active="0" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'">
-              <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                  <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="210,32,39,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <prop k="offset" v="0,0"/>
-                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="offset_unit" v="MM"/>
-                        <prop k="outline_color" v="210,32,39,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule description="10KM" active="0" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'">
-              <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                  <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="103,34,144,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <prop k="offset" v="0,0"/>
-                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="offset_unit" v="MM"/>
-                        <prop k="outline_color" v="103,34,144,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule description="5KM" active="0" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'">
-              <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
-                  <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="color" v="145,211,55,255"/>
-                        <prop k="joinstyle" v="round"/>
-                        <prop k="offset" v="0,0"/>
-                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                        <prop k="offset_unit" v="MM"/>
-                        <prop k="outline_color" v="145,211,55,255"/>
-                        <prop k="outline_style" v="solid"/>
-                        <prop k="outline_width" v="1"/>
-                        <prop k="outline_width_unit" v="MM"/>
-                        <prop k="style" v="solid"/>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
-          <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-                <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="0"/>
-                <prop k="capstyle" v="square"/>
-                <prop k="customdash" v="5;2"/>
-                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="35,35,35,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0.26"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
-        <properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="descriptio" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="timestamp" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="length_m" name="" index="8"/>
-        <alias field="length_km" name="" index="9"/>
-        <alias field="org_fid" name="" index="10"/>
-        <alias field="distance" name="" index="11"/>
-      </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="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=""/>
-      </defaults>
-      <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="org_fid" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="begin" type="field" width="-1" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
-      </labelOnTop>
-      <reuseLastValue/>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip>Text</mapTip>
-    </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
-      <extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.94550077606164962</ymin>
-        <xmax>18.42143412573762262</xmax>
-        <ymax>-33.90011331441002085</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.94550077606164962</ymin>
-        <xmax>18.42143412573762262</xmax>
-        <ymax>-33.90011331441002085</ymax>
-      </wgs84extent>
-      <id>route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
       <layerDependencies/>
@@ -20573,58 +19508,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="225,89,137,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20655,36 +19590,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -20699,44 +19634,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="225,89,137,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="161,64,98,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20759,46 +19694,104 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
-        <rules key="{3608a1f2-7607-4dc9-9391-a582d9904577}">
-          <rule description="Active routes" key="{6c8d4bc9-8e1a-4cc3-a813-97e2b0ad71f6}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{0ffa6f3f-6f8e-491c-81ad-015a65f39b56}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{8783c5e4-bc17-4d88-bec2-dbb83066c593}" description="Active routes">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                  <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="0" type="QString" name="angle"/>
+                        <Option value="square" type="QString" name="cap_style"/>
+                        <Option value="213,180,60,255" type="QString" name="color"/>
+                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                        <Option value="bevel" type="QString" name="joinstyle"/>
+                        <Option value="circle" type="QString" name="name"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="diameter" type="QString" name="scale_method"/>
+                        <Option value="2" type="QString" name="size"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="size_unit"/>
+                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="213,180,60,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option value="" type="QString" name="name"/>
+                        <Option name="properties"/>
+                        <Option value="collection" type="QString" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <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>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -20813,152 +19806,131 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option value="" type="QString" 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>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" 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"/>
-                              <Option name="type" type="int" value="3"/>
+                            <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>
                           </Option>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="" type="QString" name="name"/>
+                    <Option name="properties"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="3" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option value="" type="QString" 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>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule description="List for legends" active="0" key="{762f5e6f-d30c-4752-b4fa-0f22ed862707}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule description="21KM" active="0" key="{cf2c18af-091f-4ce5-8f44-46bd4999f2ba}" filter="&quot;Source&quot; = '21KM'">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{10fa4124-46cc-47c8-abf9-a57ba9d4b9ad}" description="List for legends" active="0">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{2b8e68ce-be16-4623-bce0-9e65634bdfd7}" description="21KM" active="0">
               <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="210,32,39,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="210,32,39,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -20973,130 +19945,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="3" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="3" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="10KM" active="0" key="{85ac541e-ff73-4c62-9c9c-f90872839ec6}" filter="&quot;Source&quot; = '10KM'">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{a4031224-6863-4443-9d92-421bcd31ec7b}" description="10KM" active="0">
               <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="103,34,144,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="103,34,144,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -21111,130 +20083,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule description="5KM" active="0" key="{648c7f2c-5087-45fa-b34c-09d50a7ddedb}" filter="&quot;Source&quot; = '5KM'">
+            <rule filter="&quot;Source&quot; = '5KM'" key="{d8cdafa5-1dcf-47dc-bda3-d64d1d4fd1b6}" description="5KM" active="0">
               <settings calloutType="simple">
-                <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="255,255,255,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="1" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedItalic="0" fontItalic="0">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="64" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-                  <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                  <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRadiiY="1" shapeSizeX="1" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                          <Option value="145,211,55,255" type="QString" name="color"/>
+                          <Option value="round" type="QString" name="joinstyle"/>
+                          <Option value="0,0" type="QString" name="offset"/>
+                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                          <Option value="MM" type="QString" name="offset_unit"/>
+                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
+                          <Option value="solid" type="QString" name="outline_style"/>
+                          <Option value="1" type="QString" name="outline_width"/>
+                          <Option value="MM" type="QString" name="outline_width_unit"/>
+                          <Option value="solid" type="QString" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -21249,98 +20221,273 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option value="" type="QString" name="name"/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option value="collection" type="QString" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option value="" type="QString" 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>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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>
                       </Option>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="0" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-                <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="20" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-20" polygonPlacementFlags="2" dist="2" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="10" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="1" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="2" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option value="" type="QString" 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>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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>
                     </Option>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option value="false" type="bool" name="drawToAllParts"/>
+                    <Option value="0" type="QString" name="enabled"/>
+                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                    <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{d922a9ed-f9f3-49b7-ade9-94d817ff0cd5}" description="Trail" active="0">
+              <settings calloutType="simple">
+                <text-style fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontUnderline="0" fontStrikeout="0" isExpression="1" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="10" fontKerning="1" textColor="255,255,255,255" textOrientation="horizontal">
+                  <families/>
+                  <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                  <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="1" shapeOpacity="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="1">
+                    <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="markerSymbol">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                        <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>
+                        <prop k="angle" v="0"/>
+                        <prop k="cap_style" v="square"/>
+                        <prop k="color" v="133,182,111,255"/>
+                        <prop k="horizontal_anchor_point" v="1"/>
+                        <prop k="joinstyle" v="bevel"/>
+                        <prop k="name" v="circle"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="35,35,35,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="0"/>
+                        <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="scale_method" v="diameter"/>
+                        <prop k="size" v="2"/>
+                        <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="size_unit" v="MM"/>
+                        <prop k="vertical_anchor_point" v="1"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option value="" type="QString" name="name"/>
+                            <Option name="properties"/>
+                            <Option value="collection" type="QString" name="type"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option value="" type="QString" name="name"/>
+                          <Option name="properties"/>
+                          <Option value="collection" type="QString" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                        <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>
+                        <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="color" v="0,72,255,255"/>
+                        <prop k="joinstyle" v="round"/>
+                        <prop k="offset" v="0,0"/>
+                        <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                        <prop k="offset_unit" v="MM"/>
+                        <prop k="outline_color" v="0,72,255,255"/>
+                        <prop k="outline_style" v="solid"/>
+                        <prop k="outline_width" v="1"/>
+                        <prop k="outline_width_unit" v="MM"/>
+                        <prop k="style" v="solid"/>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option value="" type="QString" name="name"/>
+                            <Option name="properties"/>
+                            <Option value="collection" type="QString" name="type"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                  </background>
+                  <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" name="type"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="0" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+                <placement allowDegraded="1" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="AllowOverlapIfRequired" dist="2" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="6" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="20" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="10"/>
+                <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="2" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option value="" type="QString" 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>
+                      <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>
+                      <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>
+                      <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>
+                    </Option>
+                    <Option value="collection" type="QString" 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="Map" name="ddProperties">
+                      <Option value="" type="QString" name="name"/>
+                      <Option name="properties"/>
+                      <Option value="collection" type="QString" 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 force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                    <Option value="0" type="double" name="minLength"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                    <Option value="MM" type="QString" name="minLengthUnit"/>
+                    <Option value="0" type="double" name="offsetFromAnchor"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                    <Option value="0" type="double" name="offsetFromLabel"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -21350,57 +20497,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="no_action" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+          </Option>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="100000" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="100000" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21431,9 +20583,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21441,12 +20593,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -21454,15 +20606,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21471,8 +20623,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21481,8 +20633,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21491,8 +20643,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21501,8 +20653,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21511,8 +20663,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21521,8 +20673,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21531,8 +20683,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21541,8 +20693,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21551,8 +20703,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21561,8 +20713,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -21571,54 +20723,64 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
+        <field name="quadrant" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="Distance" name="" index="5"/>
-        <alias field="RouteLen" name="" index="6"/>
-        <alias field="Source" name="" index="7"/>
-        <alias field="length_m" name="" index="8"/>
-        <alias field="length_km" name="" index="9"/>
-        <alias field="org_fid" name="" index="10"/>
-        <alias field="distance" name="" index="11"/>
+        <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="length_m" name=""/>
+        <alias index="9" field="length_km" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
+        <alias index="12" 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="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="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="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="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="quadrant" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -21633,26 +20795,28 @@ def my_form_open(dialog, layer, feature):
         <constraint field="length_km" exp="" desc=""/>
         <constraint field="org_fid" exp="" desc=""/>
         <constraint field="distance" exp="" desc=""/>
+        <constraint field="quadrant" exp="" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="org_fid" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="begin" type="field" width="-1" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="Distance" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="org_fid" width="-1"/>
+          <column hidden="0" type="field" name="distance" width="-1"/>
+          <column hidden="0" type="field" name="Name" width="-1"/>
+          <column hidden="0" type="field" name="Source" width="-1"/>
+          <column hidden="0" type="field" name="RouteLen" width="-1"/>
+          <column hidden="0" type="field" name="descriptio" width="-1"/>
+          <column hidden="0" type="field" name="timestamp" width="-1"/>
+          <column hidden="0" type="field" name="begin" width="-1"/>
+          <column hidden="0" type="field" name="end" width="-1"/>
+          <column hidden="0" type="field" name="Distance" width="-1"/>
+          <column hidden="0" type="field" name="length_km" width="-1"/>
+          <column hidden="0" type="field" name="quadrant" width="-1"/>
+          <column hidden="0" type="field" name="length_m" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21684,42 +20848,56 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21792,58 +20970,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="229,182,54,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21874,36 +21052,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -21918,44 +21096,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="229,182,54,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="164,130,39,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21978,38 +21156,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
         <symbols>
-          <symbol is_animated="0" name="0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="114,155,111,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -22024,9 +21202,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22037,7 +21215,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
@@ -22045,11 +21226,11 @@ def my_form_open(dialog, layer, feature):
       <layerOpacity>1</layerOpacity>
       <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
-          <Option type="QString" value=""/>
+          <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -22075,19 +21256,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="area" name="" index="1"/>
-        <alias field="rotation" name="" index="2"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="area" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="rotation" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="area" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="rotation" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -22098,12 +21279,12 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="area" type="field" width="-1" hidden="0"/>
-          <column name="rotation" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="area" width="-1"/>
+          <column hidden="0" type="field" name="rotation" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22126,21 +21307,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse</datasource>
+      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000' </datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -22191,7 +21372,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22216,58 +21397,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="196,60,57,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22298,36 +21479,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -22342,44 +21523,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="196,60,57,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="140,43,41,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22402,49 +21583,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
           <rule symbol="0" checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="1" pass="0">
+            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="circle" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,0" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="0.5" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22467,20 +21648,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" 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"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option value="" type="QString" 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>
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22492,61 +21673,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="StringList">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="StringList" name="dualview/previewExpressions">
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -22577,9 +21761,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22587,12 +21771,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -22600,7 +21784,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="Name" configurationFlags="None">
@@ -22628,8 +21812,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -22645,8 +21829,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -22655,8 +21839,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -22705,49 +21889,49 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="Name" name="" index="0"/>
-        <alias field="descriptio" name="" index="1"/>
-        <alias field="timestamp" name="" index="2"/>
-        <alias field="begin" name="" index="3"/>
-        <alias field="end" name="" index="4"/>
-        <alias field="RouteLen" name="" index="5"/>
-        <alias field="Source" name="" index="6"/>
-        <alias field="length_m" name="" index="7"/>
-        <alias field="length_km" name="" index="8"/>
-        <alias field="org_fid" name="" index="9"/>
-        <alias field="distance" name="" index="10"/>
-        <alias field="first_runn" name="" index="11"/>
-        <alias field="last_runne" name="" index="12"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runn" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runne" exp_strength="0" unique_strength="0"/>
+        <constraint field="Name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="descriptio" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="timestamp" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="begin" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="end" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="RouteLen" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="Source" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_m" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="length_km" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="org_fid" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="distance" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="first_runn" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="last_runne" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="Name" exp="" desc=""/>
@@ -22768,22 +21952,22 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column name="begin" type="field" width="179" hidden="0"/>
-          <column name="RouteLen" type="field" width="-1" hidden="0"/>
-          <column name="Source" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="Name" type="field" width="-1" hidden="0"/>
-          <column name="length_m" type="field" width="-1" hidden="0"/>
-          <column name="length_km" type="field" width="-1" hidden="0"/>
-          <column name="org_fid" type="field" width="-1" hidden="0"/>
-          <column name="first_runn" type="field" width="-1" hidden="0"/>
-          <column name="last_runne" type="field" width="-1" hidden="0"/>
-          <column name="descriptio" type="field" width="-1" hidden="0"/>
-          <column name="timestamp" type="field" width="-1" hidden="0"/>
-          <column name="end" type="field" width="-1" hidden="0"/>
-          <column name="distance" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="begin" width="179"/>
+          <column hidden="0" type="field" name="RouteLen" width="-1"/>
+          <column hidden="0" type="field" name="Source" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="Name" width="-1"/>
+          <column hidden="0" type="field" name="length_m" width="-1"/>
+          <column hidden="0" type="field" name="length_km" width="-1"/>
+          <column hidden="0" type="field" name="org_fid" width="-1"/>
+          <column hidden="0" type="field" name="first_runn" width="-1"/>
+          <column hidden="0" type="field" name="last_runne" width="-1"/>
+          <column hidden="0" type="field" name="descriptio" width="-1"/>
+          <column hidden="0" type="field" name="timestamp" width="-1"/>
+          <column hidden="0" type="field" name="end" width="-1"/>
+          <column hidden="0" type="field" name="distance" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22815,58 +21999,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runne" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22874,7 +22058,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Line" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiLineString" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="0">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Line" labelsEnabled="0" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiLineString" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22947,58 +22131,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="190,178,151,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23029,36 +22213,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -23073,44 +22257,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="190,178,151,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="136,127,108,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23133,58 +22317,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1">
+      <renderer-v2 referencescale="-1" type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
         <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 filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" name="0" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="123,211,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23215,50 +22399,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" name="1" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="flat" type="QString" name="capstyle"/>
+                <Option value="4;1;1;1" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="103,34,144,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="1.25" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="1" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -23289,30 +22473,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option value="4" type="QString" name="average_angle_length"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
+                <Option value="MM" type="QString" name="average_angle_unit"/>
+                <Option value="3" type="QString" name="interval"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
+                <Option value="MM" type="QString" name="interval_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="0" type="QString" name="offset_along_line"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_along_line_unit"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="true" type="bool" name="place_on_every_part"/>
+                <Option value="LastVertex" type="QString" name="placements"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="1" type="QString" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -23332,33 +22516,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" name="@1@1" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+              <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option value="0" type="QString" name="angle"/>
+                    <Option value="103,34,144,255" type="QString" name="color"/>
+                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                    <Option value="filled_arrowhead" type="QString" name="name"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="diameter" type="QString" name="scale_method"/>
+                    <Option value="5" type="QString" name="size"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="size_unit"/>
+                    <Option value="1" type="QString" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -23374,32 +22558,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" name="@@1@1@0" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="103,34,144,255" type="QString" name="color"/>
+                        <Option value="miter" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                        <Option value="no" type="QString" name="outline_style"/>
+                        <Option value="0" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -23414,9 +22598,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -23429,57 +22613,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="id" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23510,9 +22697,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23520,12 +22707,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -23533,7 +22720,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -23552,16 +22739,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="type" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -23571,11 +22758,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="type" type="field" width="-1" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="type" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23607,12 +22794,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -23620,7 +22807,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="0" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Point" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="Point" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Point" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="Point" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -23693,58 +22880,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="145,82,45,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23775,36 +22962,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -23819,44 +23006,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="145,82,45,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="104,59,32,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -23879,44 +23066,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="15" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" fieldName="label" forcedItalic="0" fontItalic="0">
+          <text-style fieldName="label" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Semibold" useSubstitutions="0" fontSize="15" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="1" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="1" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -23931,112 +23118,115 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="3"/>
-          <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="0" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="4" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="0" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MM" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontMinPixelSize="3" scaleMax="0" minFeatureSize="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" zIndex="0" scaleMin="0" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+          <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="3" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+          <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="0" offsetType="0" centroidInside="0" quadOffset="4" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+          <rendering scaleMin="0" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="1" scaleMax="0" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="0" drawLabels="1" obstacleType="0" maxNumLabels="2000" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+              <Option value="0" type="int" name="blendMode"/>
+              <Option type="Map" name="ddProperties">
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option value="false" type="bool" name="drawToAllParts"/>
+              <Option value="0" type="QString" name="enabled"/>
+              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+              <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+              <Option value="0" type="double" name="minLength"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+              <Option value="MM" type="QString" name="minLengthUnit"/>
+              <Option value="0" type="double" name="offsetFromAnchor"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+              <Option value="0" type="double" name="offsetFromLabel"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames"/>
-          <Option name="variableValues"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,2,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="1" bold="0" style="0" underline="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24067,9 +23257,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24077,12 +23267,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="18" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -24090,7 +23280,7 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
@@ -24109,16 +23299,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="label" name="" index="1"/>
+        <alias index="0" 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 constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -24128,11 +23318,11 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column name="label" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="0" type="field" name="label" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24164,12 +23354,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24177,7 +23367,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" legendPlaceholderImage="" symbologyReferenceScale="-1" simplifyDrawingHints="1" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" autoRefreshEnabled="0" geometry="Polygon" minScale="100000000" simplifyMaxScale="1" refreshOnNotifyEnabled="0" maxScale="0" wkbType="MultiPolygon" type="vector" autoRefreshTime="0" readOnly="0" labelsEnabled="1">
+    <maplayer simplifyDrawingHints="1" refreshOnNotifyMessage="" simplifyAlgorithm="0" simplifyLocal="1" refreshOnNotifyEnabled="0" geometry="Polygon" labelsEnabled="1" simplifyDrawingTol="1" autoRefreshTime="0" symbologyReferenceScale="-1" type="vector" styleCategories="AllStyleCategories" wkbType="MultiPolygon" readOnly="0" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" minScale="100000000" maxScale="0" autoRefreshEnabled="0" legendPlaceholderImage="">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -24242,7 +23432,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" minz="0" maxy="0" minx="0" maxx="0" miny="0" crs="" maxz="0"/>
+          <spatial miny="0" maxy="0" maxz="0" maxx="0" dimensions="2" minz="0" crs="" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24267,58 +23457,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" durationField="" endField="" endExpression="" accumulate="0" limitMode="0" startExpression="" fixedDuration="0" startField="" durationUnit="min">
+      <temporal startField="" durationField="" fixedDuration="0" accumulate="0" mode="0" limitMode="0" endField="" startExpression="" enabled="0" endExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" zoffset="0" binding="Centroid" clamping="Terrain" zscale="1" symbology="Line">
+      <elevation extrusion="0" symbology="Line" zscale="1" clamping="Terrain" type="IndividualFeatures" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="125,139,143,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.6" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -24349,36 +23539,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -24393,44 +23583,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option value="0" type="QString" name="angle"/>
+                <Option value="square" type="QString" name="cap_style"/>
+                <Option value="125,139,143,255" type="QString" name="color"/>
+                <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="diamond" type="QString" name="name"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="89,99,102,255" type="QString" name="outline_color"/>
+                <Option value="solid" type="QString" name="outline_style"/>
+                <Option value="0.2" type="QString" name="outline_width"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="diameter" type="QString" name="scale_method"/>
+                <Option value="3" type="QString" name="size"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                <Option value="MM" type="QString" name="size_unit"/>
+                <Option value="1" type="QString" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24453,46 +23643,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1"/>
+      <renderer-v2 referencescale="-1" type="nullSymbol" forceraster="0" symbollevels="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="31,120,180,255" textOpacity="0.90000000000000002" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" isExpression="0" fontSize="8" fontWordSpacing="0" fontKerning="1" capitalization="0" useSubstitutions="0" namedStyle="Bold" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="75" fieldName="label" forcedItalic="0" fontItalic="0">
+              <text-style fieldName="label" fontUnderline="0" fontStrikeout="0" isExpression="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="75" multilineHeight="1" legendString="Aa" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="0.90000000000000002" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="Bold" useSubstitutions="0" fontSize="8" fontKerning="1" textColor="31,120,180,255" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferSize="0.75" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferBlendMode="0"/>
-                <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-                <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0.5" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeRadiiY="0.5" shapeSizeX="0.75" shapeSizeY="0.29999999999999999" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeBorderColor="31,120,206,255" shapeDraw="1" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferOpacity="0.40000000000000002" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="0.75" bufferNoFill="0" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+                <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeJoinStyle="128" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0.75" shapeOpacity="0.59999999999999998" shapeBorderColor="31,120,206,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0.29999999999999999" shapeOffsetY="-0.14999999999999999" shapeRotation="0" shapeBorderWidth="0.75" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeDraw="1" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0.5">
+                  <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option value="" type="QString" name="name"/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option value="collection" type="QString" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,204"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.75"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                        <Option value="255,255,255,204" type="QString" name="color"/>
+                        <Option value="round" type="QString" name="joinstyle"/>
+                        <Option value="0,0" type="QString" name="offset"/>
+                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                        <Option value="MM" type="QString" name="offset_unit"/>
+                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
+                        <Option value="solid" type="QString" name="outline_style"/>
+                        <Option value="0.75" type="QString" name="outline_width"/>
+                        <Option value="MM" type="QString" name="outline_width_unit"/>
+                        <Option value="solid" type="QString" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -24507,56 +23697,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option value="" type="QString" name="name"/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option value="collection" type="QString" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+                <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format plussign="0" wrapChar="" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" reverseDirectionSymbol="0" decimals="3" addDirectionSymbol="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" multilineAlign="1"/>
-              <placement repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" lineAnchorType="0" maxCurvedCharAngleIn="25" centroidWhole="1" offsetType="0" repeatDistanceUnits="MM" preserveRotation="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" quadOffset="1" centroidInside="0" rotationUnit="AngleDegrees" geometryGenerator="" maxCurvedCharAngleOut="-25" polygonPlacementFlags="2" dist="0" rotationAngle="0" overrunDistance="0" layerType="UnknownGeometry" distUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" lineAnchorPercent="0.5" fitInPolygonOnly="0" priority="5" xOffset="1" yOffset="0" placementFlags="10" allowDegraded="0" distMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" overrunDistanceUnit="MM" offsetUnits="MapUnit" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontMinPixelSize="3" scaleMax="10000000" minFeatureSize="0" obstacleFactor="0.76000000000000001" labelPerPart="0" drawLabels="1" fontLimitPixelSize="0" maxNumLabels="6" upsidedownLabels="0" zIndex="5" scaleMin="1" limitNumLabels="0" scaleVisibility="0" unplacedVisibility="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000"/>
+              <text-format addDirectionSymbol="0" reverseDirectionSymbol="0" decimals="3" wrapChar="" plussign="0" autoWrapLength="0" leftDirectionSymbol="&lt;" multilineAlign="1" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" formatNumbers="0"/>
+              <placement allowDegraded="0" lineAnchorPercent="0.5" polygonPlacementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorType="0" rotationUnit="AngleDegrees" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" overlapHandling="PreventOverlap" dist="0" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" overrunDistance="0" fitInPolygonOnly="0" xOffset="1" offsetType="0" centroidInside="0" quadOffset="1" lineAnchorClipping="0" lineAnchorTextPoint="CenterOfText" yOffset="0" overrunDistanceUnit="MM" placementFlags="10" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" preserveRotation="1" rotationAngle="0" maxCurvedCharAngleIn="25" distUnits="MM" offsetUnits="MapUnit" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" priority="5"/>
+              <rendering scaleMin="1" fontLimitPixelSize="0" scaleVisibility="0" obstacleFactor="0.76000000000000001" scaleMax="10000000" mergeLines="0" obstacle="1" fontMinPixelSize="3" limitNumLabels="0" fontMaxPixelSize="10000" unplacedVisibility="0" labelPerPart="0" minFeatureSize="0" zIndex="5" drawLabels="1" obstacleType="0" maxNumLabels="6" upsidedownLabels="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
+                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="Map" name="ddProperties">
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol is_animated=&quot;0&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option value="false" type="bool" name="drawToAllParts"/>
+                  <Option value="0" type="QString" name="enabled"/>
+                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
+                  <Option value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; clip_to_extent=&quot;1&quot; is_animated=&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; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
+                  <Option value="0" type="double" name="minLength"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
+                  <Option value="MM" type="QString" name="minLengthUnit"/>
+                  <Option value="0" type="double" name="offsetFromAnchor"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
+                  <Option value="0" type="double" name="offsetFromLabel"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
+                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -24565,57 +23755,60 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option value="copy" type="QString" name="QFieldSync/action"/>
+          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
+          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
+          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="invalid" name="variableNames"/>
+          <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory enabled="0" rotationOffset="270" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" lineSizeType="MM" spacing="0" minimumSize="0" sizeScale="3x:0,0,0,0,0,0" showAxis="0" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" barWidth="5" backgroundAlpha="255" sizeType="MM" height="15" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" minScaleDenominator="0" penWidth="0" scaleBasedVisibility="0" penColor="#000000" spacingUnit="MM" maxScaleDenominator="1e+08" width="15" penAlpha="255">
-          <fontProperties strikethrough="0" underline="0" style="" italic="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute field="" label="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacing="0" direction="1" sizeType="MM" lineSizeType="MM" scaleDependency="Area" barWidth="5" height="15" minScaleDenominator="0" minimumSize="0" opacity="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" penWidth="0" spacingUnit="MM" sizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" enabled="0" scaleBasedVisibility="0" backgroundAlpha="255" backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
+          <fontProperties italic="0" bold="0" style="" underline="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" strikethrough="0"/>
+          <attribute field="" colorOpacity="1" label="" color="#000000"/>
           <axisSymbol>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="35,35,35,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0.26" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24646,9 +23839,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24656,12 +23849,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" priority="0" dist="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings zIndex="0" dist="0" obstacle="0" linePlacementFlags="2" showAll="1" priority="0" placement="0">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option value="" type="QString" name="name"/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option value="collection" type="QString" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
@@ -24669,15 +23862,15 @@ def my_form_open(dialog, layer, feature):
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24686,8 +23879,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24696,8 +23889,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option value="0" type="QString" name="IsMultiline"/>
+                <Option value="0" type="QString" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24711,22 +23904,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias field="id" name="" index="0"/>
-        <alias field="table_set" name="" index="1"/>
-        <alias field="label" name="" index="2"/>
-        <alias field="races" name="" index="3"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" 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="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
+        <constraint field="id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="table_set" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="label" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+        <constraint field="races" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint field="id" exp="" desc=""/>
@@ -24738,13 +23931,13 @@ def my_form_open(dialog, layer, feature):
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column name="id" type="field" width="-1" hidden="0"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column name="table_set" type="field" width="-1" hidden="0"/>
-          <column name="label" type="field" width="-1" hidden="0"/>
-          <column name="races" type="field" width="130" hidden="0"/>
+          <column hidden="0" type="field" name="id" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" type="field" name="table_set" width="-1"/>
+          <column hidden="0" type="field" name="label" width="-1"/>
+          <column hidden="0" type="field" name="races" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24776,16 +23969,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24813,14 +24006,13 @@ def my_form_open(dialog, layer, feature):
     <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
     <layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
     <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-    <layer id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
     <layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
     <layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
     <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0"/>
+    <layer id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -25002,7 +24194,7 @@ def my_form_open(dialog, layer, feature):
       <parameters type="QString">KGxwMApJMDAKYUkxCmFJNQphSTAxCmFGMS4wCmFJMDAKYU5hTmEobHAxCmFOYUkyCmFJMAphTmFOYS4=</parameters>
     </Mask>
     <Measure>
-      <Ellipsoid type="QString">WGS84</Ellipsoid>
+      <Ellipsoid type="QString">NONE</Ellipsoid>
     </Measure>
     <Measurement>
       <AreaUnits type="QString">&lt;unknown></AreaUnits>
@@ -25030,9 +24222,11 @@ def my_form_open(dialog, layer, feature):
     </Paths>
     <PositionPrecision>
       <Automatic type="bool">true</Automatic>
+      <CoordinateOrder type="QString">Default</CoordinateOrder>
       <DecimalPlaces type="int">2</DecimalPlaces>
       <DegreeFormat type="QString">MU</DegreeFormat>
     </PositionPrecision>
+    <RenderMapTile type="bool">false</RenderMapTile>
     <RequiredLayers>
       <Layers type="QStringList">
         <value>water_tables20170921142016467</value>
@@ -25094,6 +24288,7 @@ def my_form_open(dialog, layer, feature):
     <WMSContactPhone type="QString"></WMSContactPhone>
     <WMSContactPosition type="QString"></WMSContactPosition>
     <WMSDefaultMapUnitsPerMm type="double">0</WMSDefaultMapUnitsPerMm>
+    <WMSFeatureInfoUseAttributeFormSettings type="bool">false</WMSFeatureInfoUseAttributeFormSettings>
     <WMSFees type="QString">conditions unknown</WMSFees>
     <WMSImageQuality type="int">90</WMSImageQuality>
     <WMSKeywordList type="QStringList">
@@ -25132,156 +24327,165 @@ def my_form_open(dialog, layer, feature):
       <Project type="bool">false</Project>
     </WMTSPngLayers>
     <WMTSUrl type="QString"></WMTSUrl>
+    <qfieldsync>
+      <areaOfInterest type="QString"></areaOfInterest>
+      <areaOfInterestCrs type="QString"></areaOfInterestCrs>
+      <baseMapMupp type="double">10</baseMapMupp>
+      <baseMapTheme type="QString"></baseMapTheme>
+      <baseMapTileSize type="int">1024</baseMapTileSize>
+      <baseMapType type="QString">singleLayer</baseMapType>
+      <createBaseMap type="int">0</createBaseMap>
+      <digitizingLogsLayer type="QString"></digitizingLogsLayer>
+      <layerActionPreference type="QString">online</layerActionPreference>
+      <maximumImageWidthHeight type="int">0</maximumImageWidthHeight>
+      <offlineCopyOnlyAoi type="int">0</offlineCopyOnlyAoi>
+    </qfieldsync>
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option name="name" type="QString" value=""/>
+      <Option value="" type="QString" name="name"/>
       <Option name="properties"/>
-      <Option name="type" type="QString" value="collection"/>
+      <Option value="collection" type="QString" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" visible="1"/>
-      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer expanded="0" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="All Routes">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" visible="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" visible="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer expanded="1" visible="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Ask Me"/>
         <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Fencing">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer expanded="1" visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-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="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer expanded="1" visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
@@ -25289,27 +24493,25 @@ def my_form_open(dialog, layer, feature):
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer expanded="1" id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_137272a0_69df_47f0_82f8_521b9f4bef83"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal overview">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
         <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
@@ -25317,89 +24519,110 @@ def my_form_open(dialog, layer, feature):
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Proposed Routes">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1">
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
+      <layer expanded="1" visible="0" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer expanded="1" visible="1" style="default" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+      <expanded-legend-nodes id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+      <layer expanded="1" visible="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <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" visible="0" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="0" style="default" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer expanded="1" visible="0" style="default" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+      </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer expanded="0" visible="1" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" visible="1"/>
+      <layer expanded="1" visible="1" style="default" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" visible="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="1" visible="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -25427,31 +24650,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Routes" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Routes" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -25466,49 +24689,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -25523,59 +24746,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="9.44946,191.611,mm" outlineWidthM="0.3,mm" labelText="[%&quot;Distance&quot;%]" position="9.44946,191.611,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" blendMode="0" htmlState="0" type="65641" size="14.1764,7.471,mm" halign="1" valign="64" frame="false" zValue="9">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="14.1764,7.471,mm" positionLock="true" background="false" itemRotation="0" zValue="9" marginX="1" groupUuid="" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="[%&quot;Distance&quot;%]" positionOnPage="9.44946,191.611,mm" outlineWidthM="0.3,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25590,65 +24813,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="0" positionLock="true" id="" positionOnPage="24.2445,191.81,mm" outlineWidthM="0.3,mm" labelText="RACE ROUTE" position="24.2445,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" blendMode="0" htmlState="0" type="65641" size="29.2025,7.272,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="29.2025,7.272,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="0" groupUuid="" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="RACE ROUTE" positionOnPage="24.2445,191.81,mm" outlineWidthM="0.3,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25663,65 +24886,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="204.225,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" blendMode="0" htmlState="0" type="65641" size="57.4836,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="57.4836,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25736,65 +24959,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 September 2020" position="210.038,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 September 2020" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -25809,39 +25032,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25849,42 +25072,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.959,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.959,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="3" groupUuid="" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -25899,61 +25122,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" blendMode="0" followPreset="true" type="65639" size="67.7828,166.874,mm" frame="true" isTemporal="0" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="67.7828,166.874,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="2" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Routes" positionOnPage="5.86559,4.09761,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -25968,45 +25191,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26037,44 +25260,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26097,40 +25320,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26145,29 +25368,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26175,45 +25398,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" blendMode="0" followPreset="true" type="65639" size="282.012,175.592,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="282.012,174.44,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="Routes" positionOnPage="9.44946,9.08557,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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 '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41993447095743619" ymin="-33.91199999999999903" xmin="18.39750000000000085" ymax="-33.89803136713971554"/>
+        <Extent ymax="-33.89812294355778732" xmin="18.39750000000000085" xmax="18.4199345745815819" ymin="-33.91199999999999903"/>
         <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>
@@ -26228,45 +25451,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26297,44 +25520,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26357,40 +25580,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26405,29 +25628,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26435,62 +25658,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="QString" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfOgcBestPracticeFormat" type="QString" value="0"/>
-          <Option name="pdfSimplify" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="QString" name="pdfAppendGeoreference"/>
+          <Option value="0" type="QString" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="QString" name="pdfSimplify"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="1" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="0" coverageLayerName="all_routes" sortKey="length_m"/>
+      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" sortFeatures="1" sortKey="&quot;Sort&quot;" filterFeatures="1" enabled="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshals" printResolution="120" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Marshals" printResolution="120">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -26505,49 +25728,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -26562,9 +25785,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26572,15 +25795,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="5" positionOnPage="110.353,5.04491,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.1,mm" frameJoinStyle="bevel" excludeFromExports="0" size="39.4344,45.9,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="110.353,5.04491,mm" wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" type="65642" positionLock="true" symbolHeight="4" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="128" alpha="255" red="128" blue="128"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="bevel" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="1" boxSpace="2" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" positionOnPage="110.353,5.04491,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.1,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="39.4312,46.1,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" zValue="5" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" position="110.353,5.04491,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="128" green="128" blue="128"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26588,48 +25811,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,11,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,9,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="1" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,8,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Unchecked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" source="./fencing.shp|layername=fencing" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/node-order" type="QString" value="0,1,2"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="0,1,2" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -26637,62 +25860,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal map - inset" labelMargin="0,mm" mapFlags="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="98.7828,149.027,mm" outlineWidthM="0.2,mm" position="98.7828,149.027,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" blendMode="0" followPreset="true" type="65639" size="56.5192,54.5647,mm" frame="true" isTemporal="0" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="56.5192,54.5647,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="4" groupUuid="" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal map - inset" positionOnPage="98.7828,149.027,mm" isTemporal="0" outlineWidthM="0.2,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41493455420295433" ymin="-33.90316824413850583" xmin="18.41064302246786966" ymax="-33.89902512102636223"/>
+        <Extent ymax="-33.89902512102636223" xmin="18.41064302246786966" xmax="18.41493455420295433" ymin="-33.90316824413850583"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26723,44 +25946,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -26783,40 +26006,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26831,29 +26054,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26861,28 +26084,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" inverted="0" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1">
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" blendMode="0" centered="1" show="1" inverted="0" name="Overview 1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,65,170,127"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,102"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,65,170,127" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,102" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -26897,9 +26120,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -26907,9 +26130,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -26917,69 +26140,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal map - main" labelMargin="0,mm" mapFlags="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="3.53,6.0007,mm" outlineWidthM="0.3,mm" position="3.53,6.0007,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="false" mapRotation="0" referencePoint="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" followPreset="true" type="65639" size="142,187.018,mm" frame="false" isTemporal="0" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="142,187.018,mm" positionLock="true" background="false" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="3" groupUuid="" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal map - main" positionOnPage="3.53,6.0007,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41330222336237554" ymin="-33.9017728906146445" xmin="18.41227535330844844" ymax="-33.90042047455022356"/>
+        <Extent ymax="-33.90042047455022356" xmin="18.41227535330844844" xmax="18.41330222336237554" ymin="-33.9017728906146445"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27010,44 +26233,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -27070,40 +26293,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27118,29 +26341,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27148,22 +26371,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap scalingMode="0" atlasDriven="1" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem visibility="1" sectionX="0" hideBackgroundIfEmpty="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" opacity="1" sectionWidth="142.117" itemRotation="0" groupUuid="" sectionHeight="182.4" positionLock="true" id="" positionOnPage="290.617,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hidePageIfEmpty="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" outlineWidthM="0.3,mm" position="290.617,6.0007,mm" frameJoinStyle="round" excludeFromExports="0" background="false" referencePoint="2" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" blendMode="0" type="65647" size="142.117,187.018,mm" frame="false" zValue="2" sectionY="0">
-        <FrameColor green="119" alpha="255" red="119" blue="119"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="2" sectionWidth="142.117" size="142.117,187.018,mm" positionLock="true" background="false" sectionX="0" sectionY="0" itemRotation="0" hidePageIfEmpty="0" zValue="2" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" groupUuid="" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" excludeFromExports="0" frame="false" visibility="1" type="65647" opacity="1" sectionHeight="182.4" frameJoinStyle="round" blendMode="0" positionOnPage="290.617,6.0007,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" outlineWidthM="0.3,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" id="">
+        <FrameColor alpha="255" red="119" green="119" blue="119"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27171,21 +26394,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="246.665,178.41,mm" outlineWidthM="0.3,mm" pictureWidth="47.1065" position="246.665,178.41,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" blendMode="0" type="65640" size="47.1065,27.6,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="1" pictureHeight="27.561" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="47.1065,27.6,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="1" pictureWidth="47.1065" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" mapUuid="" resizeMode="0" anchorPoint="0" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="27.561" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="246.665,178.41,mm" mode="1" outlineWidthM="0.3,mm" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27193,14 +26416,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" url="" evaluateExpressions="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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" type="65648" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12">
+      <LayoutMultiFrame maxBreakDistance="12" stylesheetEnabled="true" useSmartBreaks="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;}" type="65648" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" url="" resizeMode="0" evaluateExpressions="true" contentMode="1">
         <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27210,53 +26433,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropMarginUnit" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="rasterize" type="QString" value="false"/>
-          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="0" type="QString" name="imageCropMarginUnit"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="rasterize"/>
+          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
+          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;position&quot;" 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" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerName="marshal_positions" sortKey="position"/>
+      <Atlas filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" pageNameExpression="&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" sortFeatures="1" sortKey="position" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" printResolution="120" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Marshal Plan" printResolution="120">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27271,49 +26494,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" blendMode="0" type="65638" size="297,420,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,420,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27328,9 +26551,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27338,15 +26561,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="8" positionOnPage="15.6525,12.5708,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="21.6797,27,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="15.6525,12.5708,mm" wrapChar="" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" type="65642" positionLock="true" symbolHeight="4" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" frame="false" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="false" equalColumnWidth="1" boxSpace="2" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" positionOnPage="15.6525,12.5708,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="21.6797,27,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" zValue="8" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" wmsLegendHeight="25" position="15.6525,12.5708,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27354,35 +26577,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="1" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27390,47 +26613,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="5.69321,399.106,mm" outlineWidthM="0.3,mm" labelText="MARSHAL POSITIONS" position="5.69321,399.106,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" blendMode="0" htmlState="0" type="65641" size="45.1194,7.36972,mm" halign="1" valign="64" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="45.1194,7.36972,mm" positionLock="true" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,399.106,mm" outlineWidthM="0.3,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27445,65 +26668,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" labelText="Page [% &quot;page&quot; %]" position="5.69321,406.988,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" blendMode="0" htmlState="0" type="65641" size="16.2476,7.80192,mm" halign="1" valign="32" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="16.2476,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Page [% &quot;page&quot; %]" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27518,65 +26741,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="214.292,406.988,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.2" position="214.292,406.988,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" blendMode="0" htmlState="0" type="65641" size="27.7839,7.51682,mm" halign="2" valign="32" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="27.7839,7.51682,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.2" positionOnPage="214.292,406.988,mm" outlineWidthM="0.3,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27591,65 +26814,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="185.72,399.107,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="185.72,399.107,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" blendMode="0" htmlState="0" type="65641" size="56.3557,7.36902,mm" halign="2" valign="64" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="56.3557,7.36902,mm" positionLock="true" background="false" itemRotation="0" zValue="4" marginX="1" groupUuid="" position="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="185.72,399.107,mm" outlineWidthM="0.3,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27664,39 +26887,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="243.319,382.696,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" position="243.319,382.696,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="8" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" svgBorderWidth="0.2" blendMode="0" type="65640" size="49.3143,31.2967,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="3" pictureHeight="28.8527" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="49.3143,31.2967,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="3" pictureWidth="49.3143" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="243.319,382.696,mm" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" mapUuid="" resizeMode="0" anchorPoint="8" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="28.8527" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="243.319,382.696,mm" mode="1" outlineWidthM="0.3,mm" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27704,42 +26927,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="236.083,0.14328,mm" frame="false" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="236.083,0.14328,mm" positionLock="true" background="false" itemRotation="0" zValue="2" groupUuid="" position="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -27754,90 +26977,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal overview" labelMargin="0,mm" mapFlags="0" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.03,5.9483,mm" outlineWidthM="0.3,mm" position="5.03,5.9483,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" blendMode="0" followPreset="true" type="65639" size="286.94,392.396,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="286.94,392.396,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="5.03,5.9483,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal overview" positionOnPage="5.03,5.9483,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38613924055453452" ymin="-33.94797288016832226" xmin="18.36924763341120581" ymax="-33.9248732774534929"/>
+        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;page&quot;" 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" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="marshal_overviews" sortKey="page"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="marshal_overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" pageNameExpression="&quot;page&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" sortFeatures="1" sortKey="page" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27852,49 +27075,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27909,9 +27132,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27919,21 +27142,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="286.027,2,mm" outlineWidthM="0.3,mm" pictureWidth="6.31767" position="286.027,2,mm" pictureRotation="330" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" blendMode="0" type="65640" size="9.45865,11,mm" mode="0" northMode="0" frame="false" file="arrows/NorthArrow_11.svg" resizeMode="0" zValue="4" pictureHeight="7.97477" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="9.45865,11,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="6.31767" pictureRotation="330" groupUuid="" svgFillColor="255,255,255,255" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" resizeMode="0" anchorPoint="0" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="7.97477" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="286.027,2,mm" mode="0" outlineWidthM="0.3,mm" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" id="" file="arrows/NorthArrow_11.svg" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27941,47 +27164,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginY="1" opacity="1" itemRotation="270" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" labelText="[%upper( &quot;area&quot; )%]" position="285.027,205.886,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" blendMode="0" htmlState="0" type="65641" size="142.543,10.3185,mm" halign="1" valign="64" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="142.543,10.3185,mm" positionLock="true" background="false" itemRotation="270" zValue="3" marginX="1" groupUuid="" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -27996,65 +27219,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" unitLabel="m" lineCapStyle="square" numUnitsPerSegment="90" segmentSizeMode="1" zValue="2" positionOnPage="7,189.669,mm" groupUuid="" numSegments="4" numSubdivisions="1" unitType="meters" referencePoint="0" labelVerticalPlacement="0" visibility="1" subdivisionsHeight="1.5" boxContentSpace="1" labelHorizontalPlacement="0" style="Single Box" outlineWidthM="0.3,mm" maxBarWidth="150" frameJoinStyle="miter" excludeFromExports="0" size="155.4,16.2165,mm" outlineWidth="0.3" segmentMillimeters="28.5458" itemRotation="0" numMapUnitsPerScaleBarUnit="1" background="false" lineJoinStyle="miter" position="7,189.669,mm" type="65646" positionLock="true" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" id="" height="3" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" minBarWidth="50" frame="false" numSegmentsLeft="2" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelBarSpace="3" alignment="0">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" labelHorizontalPlacement="0" type="65646" frameJoinStyle="miter" lineCapStyle="square" boxContentSpace="1" maxBarWidth="150" id="" labelBarSpace="3" outlineWidth="0.3" lineJoinStyle="miter" visibility="1" labelVerticalPlacement="0" minBarWidth="50" background="false" opacity="1" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" subdivisionsHeight="1.5" style="Single Box" positionOnPage="7,189.669,mm" referencePoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" blendMode="0" outlineWidthM="0.3,mm" segmentSizeMode="1" numUnitsPerSegment="90" unitLabel="m" positionLock="true" size="155.4,16.2165,mm" excludeFromExports="0" alignment="0" itemRotation="0" numSubdivisions="1" unitType="meters" segmentMillimeters="28.5458" zValue="2" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" height="3" numSegments="4" position="7,189.669,mm" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28069,75 +27292,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" alpha="255" red="0" blue="0"/>
+        <strokeColor alpha="255" red="0" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="QChar" value=""/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="QChar" value=""/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" alpha="255" red="0" blue="0"/>
-        <fillColor2 green="255" alpha="255" red="255" blue="255"/>
+        <fillColor alpha="255" red="0" green="0" blue="0"/>
+        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28168,52 +27391,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28244,52 +27467,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.3" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28320,36 +27543,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -28364,36 +27587,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28408,87 +27631,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Start/Finish" labelMargin="0,mm" mapFlags="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="7,5.5,mm" outlineWidthM="0.3,mm" position="7,5.5,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="false" mapRotation="330" referencePoint="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" blendMode="0" followPreset="true" type="65639" size="278.027,180.318,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="278.027,180.318,mm" positionLock="true" background="false" drawCanvasItems="false" followPreset="true" mapRotation="330" itemRotation="0" zValue="1" groupUuid="" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Start/Finish" positionOnPage="7,5.5,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="rotation"/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="id"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" xmin="18.40843143571575169" ymax="-33.89880140828828559"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="1" topAnnotationDisplay="3" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="3" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="3" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="5" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="5" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="3" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="4" topAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="1" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="5" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="3" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="5" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28519,44 +27742,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -28579,9 +27802,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -28598,32 +27821,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -28638,29 +27861,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28668,65 +27891,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
-          <Option name="svgCropMarginBottom" type="QString" value="0"/>
-          <Option name="svgCropMarginLeft" type="QString" value="0"/>
-          <Option name="svgCropMarginRight" type="QString" value="0"/>
-          <Option name="svgCropMarginTop" type="QString" value="0"/>
-          <Option name="svgCropToContents" type="QString" value="true"/>
-          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
-          <Option name="svgGroupLayers" type="QString" value="false"/>
-          <Option name="svgIncludeMetadata" type="QString" value="1"/>
-          <Option name="svgTextFormat" type="QString" value="0"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
+          <Option value="0" type="QString" name="svgCropMarginBottom"/>
+          <Option value="0" type="QString" name="svgCropMarginLeft"/>
+          <Option value="0" type="QString" name="svgCropMarginRight"/>
+          <Option value="0" type="QString" name="svgCropMarginTop"/>
+          <Option value="true" type="QString" name="svgCropToContents"/>
+          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
+          <Option value="false" type="QString" name="svgGroupLayers"/>
+          <Option value="1" type="QString" name="svgIncludeMetadata"/>
+          <Option value="0" type="QString" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;area&quot;" 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" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="start_finish_area" sortKey="area"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="start_finish_area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" pageNameExpression="&quot;area&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" sortFeatures="1" sortKey="area" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" printResolution="300" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Fencing" printResolution="300">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28741,49 +27964,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28798,9 +28021,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28808,47 +28031,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="6.76779,190.27,mm" outlineWidthM="0.3,mm" labelText="FENCING: [% &quot;name&quot; %]" position="6.76779,190.27,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" blendMode="0" htmlState="0" type="65641" size="148.46,7.36972,mm" halign="1" valign="64" frame="false" zValue="11">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="148.46,7.36972,mm" positionLock="true" background="false" itemRotation="0" zValue="11" marginX="1" groupUuid="" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,190.27,mm" outlineWidthM="0.3,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28863,65 +28086,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="211.295,197.64,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="211.295,197.64,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" blendMode="0" htmlState="0" type="65641" size="27.7839,7.51682,mm" halign="2" valign="32" frame="false" zValue="10">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="27.7839,7.51682,mm" positionLock="true" background="false" itemRotation="0" zValue="10" marginX="1" groupUuid="" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="211.295,197.64,mm" outlineWidthM="0.3,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28936,65 +28159,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="115.637,198.083,mm" outlineWidthM="0.3,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" position="115.637,198.083,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" blendMode="0" htmlState="0" type="65641" size="67.0856,7.80192,mm" halign="1" valign="32" frame="false" zValue="9">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="67.0856,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="9" marginX="1" groupUuid="" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="115.637,198.083,mm" outlineWidthM="0.3,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29009,65 +28232,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="59.5581,198.083,mm" outlineWidthM="0.3,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" position="59.5581,198.083,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" blendMode="0" htmlState="0" type="65641" size="53.0017,7.80192,mm" halign="1" valign="32" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="53.0017,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="1" groupUuid="" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="59.5581,198.083,mm" outlineWidthM="0.3,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29082,65 +28305,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" labelText="Page [% @atlas_featurenumber %]" position="6.76779,198.083,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" blendMode="0" htmlState="0" type="65641" size="52.7903,7.80192,mm" halign="1" valign="32" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="52.7903,7.80192,mm" positionLock="true" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29155,39 +28378,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" position="243.098,175.353,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="8" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" blendMode="0" type="65640" size="49.3143,29.8354,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="6" pictureHeight="28.8527" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="49.3143,29.8354,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="6" pictureWidth="49.3143" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" mapUuid="" resizeMode="0" anchorPoint="8" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="28.8527" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="243.098,175.353,mm" mode="1" outlineWidthM="0.3,mm" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29195,47 +28418,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="182.723,190.271,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 September 2020" position="182.723,190.271,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" blendMode="0" htmlState="0" type="65641" size="56.3557,7.36902,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="56.3557,7.36902,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 September 2020" positionOnPage="182.723,190.271,mm" outlineWidthM="0.3,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29250,60 +28473,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="232.01,0.14328,mm" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="232.01,0.14328,mm" positionLock="true" background="false" itemRotation="0" zValue="4" groupUuid="" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -29318,55 +28541,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem blendMode="0" unitLabel="m" lineCapStyle="square" numUnitsPerSegment="9" segmentSizeMode="1" zValue="3" positionOnPage="6.76779,2.8482,mm" groupUuid="" numSegments="2" numSubdivisions="1" unitType="meters" referencePoint="0" labelVerticalPlacement="0" visibility="1" subdivisionsHeight="1.5" boxContentSpace="0.2" labelHorizontalPlacement="0" style="Double Box" outlineWidthM="0.3,mm" maxBarWidth="100" frameJoinStyle="miter" excludeFromExports="0" size="101.03,15.8378,mm" outlineWidth="0.2" segmentMillimeters="30.7927" itemRotation="0" numMapUnitsPerScaleBarUnit="1" background="false" lineJoinStyle="round" position="6.76779,2.8482,mm" type="65646" positionLock="true" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" id="" height="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" minBarWidth="25" frame="false" numSegmentsLeft="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelBarSpace="1" alignment="0">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" labelHorizontalPlacement="0" type="65646" frameJoinStyle="miter" lineCapStyle="square" boxContentSpace="0.2" maxBarWidth="100" id="" labelBarSpace="1" outlineWidth="0.2" lineJoinStyle="round" visibility="1" labelVerticalPlacement="0" minBarWidth="25" background="false" opacity="1" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" subdivisionsHeight="1.5" style="Double Box" positionOnPage="6.76779,2.8482,mm" referencePoint="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" outlineWidthM="0.3,mm" segmentSizeMode="1" numUnitsPerSegment="9" unitLabel="m" positionLock="true" size="101.03,15.8378,mm" excludeFromExports="0" alignment="0" itemRotation="0" numSubdivisions="1" unitType="meters" segmentMillimeters="30.7927" zValue="3" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" height="2" numSegments="2" position="6.76779,2.8482,mm" numSegmentsLeft="2" numMapUnitsPerScaleBarUnit="1">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="0" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29381,75 +28604,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" alpha="255" red="0" blue="0"/>
+        <strokeColor alpha="255" red="0" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="QChar" value=""/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="QChar" value=""/>
+            <Option value="" type="QChar" name="decimal_separator"/>
+            <Option value="6" type="int" name="decimals"/>
+            <Option value="0" type="int" name="rounding_type"/>
+            <Option value="false" type="bool" name="show_plus"/>
+            <Option value="true" type="bool" name="show_thousand_separator"/>
+            <Option value="false" type="bool" name="show_trailing_zeros"/>
+            <Option value="" type="QChar" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor green="0" alpha="255" red="0" blue="0"/>
-        <fillColor2 green="255" alpha="255" red="255" blue="255"/>
+        <fillColor alpha="255" red="0" green="0" blue="0"/>
+        <fillColor2 alpha="255" red="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29480,52 +28703,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29556,52 +28779,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option value="0" type="QString" name="align_dash_pattern"/>
+                <Option value="square" type="QString" name="capstyle"/>
+                <Option value="5;2" type="QString" name="customdash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                <Option value="MM" type="QString" name="customdash_unit"/>
+                <Option value="0" type="QString" name="dash_pattern_offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                <Option value="0" type="QString" name="draw_inside_polygon"/>
+                <Option value="round" type="QString" name="joinstyle"/>
+                <Option value="0,0,0,255" type="QString" name="line_color"/>
+                <Option value="solid" type="QString" name="line_style"/>
+                <Option value="0.2" type="QString" name="line_width"/>
+                <Option value="MM" type="QString" name="line_width_unit"/>
+                <Option value="0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="0" type="QString" name="ring_filter"/>
+                <Option value="0" type="QString" name="trim_distance_end"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                <Option value="0" type="QString" name="trim_distance_start"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                <Option value="0" type="QString" name="use_custom_dash"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29632,36 +28855,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 name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="0,0,0,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -29676,36 +28899,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="bevel" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29720,24 +28943,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="2" positionOnPage="256.808,2.9982,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="38.1563,54.9504,mm" itemRotation="0" resizeToContents="0" boxSpace="2" background="true" position="256.808,2.9982,mm" wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65642" positionLock="true" symbolHeight="4" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="0" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="1" boxSpace="2" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" positionOnPage="256.808,2.9982,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="38.1563,54.9504,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" zValue="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" position="256.808,2.9982,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29745,52 +28968,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Bold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" bold="1"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="1" style="Bold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" source="./fencing.shp|layername=fencing" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" patch_size="0,0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option name="legend/expressionFilter" type="QString" value=""/>
-                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="" type="QString" name="legend/expressionFilter"/>
+                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" patch_size="0,0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29798,44 +29021,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Fencing" labelMargin="0,mm" mapFlags="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" position="6.76779,9.35102,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="false" mapRotation="0" referencePoint="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" followPreset="true" type="65639" size="283.418,180.92,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="283.418,180.92,mm" positionLock="true" background="false" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="0.9" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Fencing" positionOnPage="6.76779,9.35102,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" type="double" value="1"/>
-                      <Option name="maxOutput" type="double" value="360"/>
-                      <Option name="maxValue" type="double" value="0"/>
-                      <Option name="minOutput" type="double" value="0"/>
-                      <Option name="minValue" type="double" value="0"/>
-                      <Option name="nullOutput" type="double" value="0"/>
+              <Option value="" type="QString" 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="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>
-                    <Option name="t" type="int" value="0"/>
+                    <Option value="0" type="int" name="t"/>
                   </Option>
-                  <Option name="type" type="int" value="3"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4172496509604926" ymin="-33.90421228789515595" xmin="18.41635400827248503" ymax="-33.90364055490629625"/>
+        <Extent ymax="-33.90364055490629625" xmin="18.41635400827248503" xmax="18.4172496509604926" ymin="-33.90421228789515595"/>
         <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>
@@ -29850,45 +29073,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="1" topAnnotationDisplay="3" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="3" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="3" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="5" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="4" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="5" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="3" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="4" topAnnotationPosition="1" topAnnotationDisplay="3" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="1" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="5" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="3" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="5" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="195,195,195,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29919,44 +29142,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29979,9 +29202,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29998,32 +29221,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30038,29 +29261,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30068,62 +29291,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap scalingMode="2" atlasDriven="1" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="QString" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfOgcBestPracticeFormat" type="QString" value="0"/>
-          <Option name="pdfSimplify" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="rasterize" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="QString" name="pdfAppendGeoreference"/>
+          <Option value="0" type="QString" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="QString" name="pdfSimplify"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="rasterize"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="virtual" sortFeatures="1" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="fence_groups" sortKey="group"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" sortAscending="1" coverageLayerName="fence_groups" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1" sortFeatures="1" sortKey="group" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="9" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="9" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30138,49 +29361,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30195,59 +29418,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" labelText="Directions to Start of Race" position="4.43449,186.634,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" blendMode="0" htmlState="0" type="65641" size="83.9998,10.4638,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="83.9998,10.4638,mm" positionLock="false" background="false" itemRotation="0" zValue="8" marginX="1" groupUuid="" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30262,65 +29485,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" labelText="Gun Run" position="4.43449,197.498,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" blendMode="0" htmlState="0" type="65641" size="48.2923,9.511,mm" halign="1" valign="32" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="48.2923,9.511,mm" positionLock="false" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30335,33 +29558,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="6" positionOnPage="10.096,10.8563,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="0" referencePoint="0" visibility="1" legendFilterByMap="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="round" excludeFromExports="0" size="59.0766,76,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="10.096,10.8563,mm" wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65642" positionLock="false" symbolHeight="5" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" title="" symbolAlignment="1" symbolWidth="9" equalColumnWidth="0">
-        <FrameColor green="139" alpha="255" red="139" blue="139"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="round" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="5" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="9" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="0" boxSpace="2" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" positionOnPage="10.096,10.8563,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="false" size="59.0766,76,mm" excludeFromExports="0" fontColor="#000000" columnSpace="0" itemRotation="0" lineSpacing="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" zValue="6" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" position="10.096,10.8563,mm" title="" legendFilterByMap="1" wrapChar="">
+        <FrameColor alpha="255" red="139" green="139" blue="139"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30369,52 +29592,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="3" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" marginTop="2.5" marginLeft="3" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" type="QString" value="hidden"/>
+                <Option value="hidden" type="QString" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="poi_labels" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
-                  <Option name="legend/label-1" type="QString" value="Toilets"/>
-                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
-                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
-                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
-                  <Option name="legend/label-5" type="QString" value="Parking"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
+                  <Option value="Toilets" type="QString" name="legend/label-1"/>
+                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
+                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
+                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
+                  <Option value="Parking" type="QString" name="legend/label-5"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="directions_to_start" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
-                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
-                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
+                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
+                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30422,47 +29645,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="221.862,190.027,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" blendMode="0" htmlState="0" type="65641" size="27.7839,6.871,mm" halign="2" valign="32" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="27.7839,6.871,mm" positionLock="false" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30477,65 +29700,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="197.975,197.498,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="false" background="false" itemRotation="0" zValue="4" marginX="1" groupUuid="" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30550,39 +29773,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="false" id="" positionOnPage="249.646,179.724,mm" outlineWidthM="0.3,mm" pictureWidth="41.6737" position="249.646,179.724,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" blendMode="0" type="65640" size="42.9838,24.3824,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="3" pictureHeight="24.3824" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="42.9838,24.3824,mm" positionLock="false" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="3" pictureWidth="41.6737" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="24.3824" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="249.646,179.724,mm" mode="1" outlineWidthM="0.3,mm" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30590,42 +29813,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="244.912,0.1,mm" frame="false" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="244.912,0.1,mm" positionLock="false" background="false" itemRotation="0" zValue="2" groupUuid="" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -30640,46 +29863,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Ask Me" labelMargin="0,mm" mapFlags="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="4.43449,6.411,mm" outlineWidthM="0.3,mm" position="4.43449,6.411,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" blendMode="0" followPreset="true" type="65639" size="288.007,183.616,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="288.007,183.616,mm" positionLock="false" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Ask Me" positionOnPage="4.43449,6.411,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" xmin="18.39762336729721071" ymax="-33.8970204297764468"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -30694,45 +29917,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30763,44 +29986,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30823,40 +30046,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30871,29 +30094,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30901,56 +30124,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="0" enabled="0" sortFeatures="0" pageNameExpression="" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" pageNameExpression="" hideCoverage="0" sortFeatures="0" filterFeatures="0" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="All Routes" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="All Routes" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30965,49 +30188,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31022,59 +30245,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="9.7863,192.073,mm" outlineWidthM="0.3,mm" labelText="The Gun Run 2022: [%&quot;Source&quot;%]" position="9.7863,192.073,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" blendMode="0" htmlState="0" type="65641" size="61.5373,6.60801,mm" halign="1" valign="64" frame="false" zValue="11">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="61.5373,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="10" marginX="1" groupUuid="" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" outlineWidthM="0.3,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31089,65 +30312,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="200.171,199.082,mm" outlineWidthM="0.3,mm" labelText="REVISION 1" position="200.171,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" blendMode="0" htmlState="0" type="65641" size="61.5373,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="61.5373,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="9" marginX="1" groupUuid="" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 2" positionOnPage="200.171,199.082,mm" outlineWidthM="0.3,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31162,65 +30385,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="false" id="" positionOnPage="9.7863,199.082,mm" outlineWidthM="0.3,mm" labelText="[% if( &quot;Distance&quot;   = '5KM' ,&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" position="9.7863,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" blendMode="0" htmlState="0" type="65641" size="61.5373,6.60801,mm" halign="1" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="61.5373,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="1" groupUuid="" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" positionOnPage="9.7863,199.082,mm" outlineWidthM="0.3,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31235,39 +30458,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="7" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31275,42 +30498,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.57644,198.832,mm" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.982,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.982,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="6" groupUuid="" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.57644,198.832,mm" outlineWidthM="0.3,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31325,348 +30548,171 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" blendMode="0" followPreset="false" type="65639" size="67.7828,166.874,mm" frame="true" isTemporal="0" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="67.7828,166.874,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="false" mapRotation="0" itemRotation="0" zValue="5" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Routes" positionOnPage="5.86559,4.09761,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" id="Left inset">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option type="Map" name="dataDefinedOpacity">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" ymin="-33.94700000000000273" xmin="18.37399999999999878" ymax="-33.91681492292400435"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
-          <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
-                <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <prop k="align_dash_pattern" v="0"/>
-                <prop k="capstyle" v="square"/>
-                <prop k="customdash" v="5;2"/>
-                <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="customdash_unit" v="MM"/>
-                <prop k="dash_pattern_offset" v="0"/>
-                <prop k="dash_pattern_offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="dash_pattern_offset_unit" v="MM"/>
-                <prop k="draw_inside_polygon" v="0"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="line_color" v="0,0,0,255"/>
-                <prop k="line_style" v="solid"/>
-                <prop k="line_width" v="0"/>
-                <prop k="line_width_unit" v="MM"/>
-                <prop k="offset" v="0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="ring_filter" v="0"/>
-                <prop k="trim_distance_end" v="0"/>
-                <prop k="trim_distance_end_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_end_unit" v="MM"/>
-                <prop k="trim_distance_start" v="0"/>
-                <prop k="trim_distance_start_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="trim_distance_start_unit" v="MM"/>
-                <prop k="tweak_dash_pattern_on_corners" v="0"/>
-                <prop k="use_custom_dash" v="0"/>
-                <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </lineStyle>
-          <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
-                <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
-                </Option>
-                <prop k="angle" v="0"/>
-                <prop k="cap_style" v="square"/>
-                <prop k="color" v="0,0,0,255"/>
-                <prop k="horizontal_anchor_point" v="1"/>
-                <prop k="joinstyle" v="bevel"/>
-                <prop k="name" v="circle"/>
-                <prop k="offset" v="0,0"/>
-                <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="offset_unit" v="MM"/>
-                <prop k="outline_color" v="0,0,0,255"/>
-                <prop k="outline_style" v="solid"/>
-                <prop k="outline_width" v="0"/>
-                <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="outline_width_unit" v="MM"/>
-                <prop k="scale_method" v="diameter"/>
-                <prop k="size" v="2"/>
-                <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                <prop k="size_unit" v="MM"/>
-                <prop k="vertical_anchor_point" v="1"/>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
-            <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
-                  <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
-                  </Option>
-                  <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="color" v="255,255,255,255"/>
-                  <prop k="joinstyle" v="bevel"/>
-                  <prop k="offset" v="0,0"/>
-                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                  <prop k="offset_unit" v="MM"/>
-                  <prop k="outline_color" v="128,128,128,255"/>
-                  <prop k="outline_style" v="no"/>
-                  <prop k="outline_width" v="0"/>
-                  <prop k="outline_width_unit" v="MM"/>
-                  <prop k="style" v="solid"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
-            <dd_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </dd_properties>
-          </text-style>
-          <LayoutObject>
-            <dataDefinedProperties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </dataDefinedProperties>
-            <customproperties>
-              <Option/>
-            </customproperties>
-          </LayoutObject>
-        </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" visibility="1" followPresetName="Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.50144,5.50066,mm" outlineWidthM="0.15,mm" position="9.50144,5.50066,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" blendMode="0" followPreset="false" type="65639" size="282.372,186.234,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="113.3,76.1023,mm" positionLock="true" background="true" drawCanvasItems="true" followPreset="false" mapRotation="0" itemRotation="0" zValue="4" groupUuid="" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="" positionOnPage="126.141,118.975,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" keepLayerSet="false" id="Bottom inset">
+        <FrameColor alpha="255" red="103" green="34" blue="144"/>
+        <BackgroundColor alpha="255" red="200" green="175" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '9000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '4500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
-                </Option>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.372'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.381'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.398'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
-                </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.926'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.921'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.909'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41637829490390388" ymin="-33.90899999999999892" xmin="18.39799999999999969" ymax="-33.89687885748661955"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <AtlasMap scalingMode="0" atlasDriven="0" margin="0.10000000000000001"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+      </LayoutItem>
+      <LayoutItem referencePoint="0" size="282.372,186.234,mm" positionLock="true" background="true" drawCanvasItems="true" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="Routes" positionOnPage="9.50144,5.50066,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" id="Main Map">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option value="" type="QString" 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>
+                <Option type="Map" name="dataDefinedMapXMin">
+                  <Option value="true" type="bool" name="active"/>
+                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.381'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+                <Option type="Map" name="dataDefinedMapYMin">
+                  <Option 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.926'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.909'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
+                  <Option value="3" type="int" name="type"/>
+                </Option>
+              </Option>
+              <Option value="collection" type="QString" name="type"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymax="-33.89971725489675691" xmin="18.36400000000000077" xmax="18.45388556738928187" ymin="-33.95900000000000318"/>
+        <LayerSet/>
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31697,44 +30743,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31757,40 +30803,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31805,29 +30851,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31835,63 +30881,125 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.19" scalingMode="2" atlasDriven="0"/>
+        <ComposerMapOverview frameMap="" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" blendMode="0" centered="0" show="1" inverted="0" name="Overview 1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
+            <data_defined_properties>
+              <Option type="Map">
+                <Option value="" type="QString" 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>
+                </Option>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </data_defined_properties>
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <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>
+              <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="103,34,144,26"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="103,34,144,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.26"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="style" v="solid"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option value="" type="QString" name="name"/>
+                  <Option name="properties"/>
+                  <Option value="collection" type="QString" name="type"/>
+                </Option>
+              </data_defined_properties>
+            </layer>
+          </symbol>
+          <LayoutObject>
+            <dataDefinedProperties>
+              <Option type="Map">
+                <Option value="" type="QString" name="name"/>
+                <Option name="properties"/>
+                <Option value="collection" type="QString" name="type"/>
+              </Option>
+            </dataDefinedProperties>
+            <customproperties>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+        </ComposerMapOverview>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0~~~route_markers_137272a0_69df_47f0_82f8_521b9f4bef83~~~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"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="int" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="1" type="int" name="pdfAppendGeoreference"/>
+          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
+          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
+          <Option value="" type="QString" name="pdfExportThemes"/>
+          <Option value="1" type="int" name="pdfIncludeMetadata"/>
+          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~route_markers_1b43c872_cc40_41a6_b13f_1819b36579b0~~~route_markers_137272a0_69df_47f0_82f8_521b9f4bef83~~~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" type="QString" name="pdfLayerOrder"/>
+          <Option value="0" type="int" name="pdfLosslessImages"/>
+          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
+          <Option value="1" type="int" name="pdfSimplify"/>
+          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option value="true" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" filterFeatures="1" enabled="1" coverageLayerProvider="ogr" sortFeatures="1" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21)' )" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="0" coverageLayerName="all_routes" sortKey="length_m"/>
+      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayerProvider="ogr" sortAscending="1" coverageLayerName="all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" sortFeatures="1" sortKey="&quot;Sort&quot;" filterFeatures="1" enabled="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" printResolution="120" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Marshal Plan A1" printResolution="120">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31906,49 +31014,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0" type="65638" size="594,841,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="594,841,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31963,9 +31071,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31973,15 +31081,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="8" positionOnPage="25.5925,18.7971,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="18.6109,9,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="25.5925,18.7971,mm" wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" type="65642" positionLock="true" symbolHeight="4" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="false" equalColumnWidth="1" boxSpace="2" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" positionOnPage="25.5925,18.7971,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="18.6109,9,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" zValue="8" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" position="25.5925,18.7971,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31989,37 +31097,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="1">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="1" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="all_routes" expanded="1" id="all_routes20170907054841602" legend_split_behavior="0" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" patch_size="0,0" id="all_routes20170907054841602" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="QString" value="0"/>
+                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
+                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option value="0" type="QString" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32027,47 +31135,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" labelText="MARSHAL POSITIONS" position="5.2963,808.939,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" blendMode="0" htmlState="0" type="65641" size="91.9494,15.0649,mm" halign="1" valign="64" frame="false" zValue="7">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="91.9494,15.0649,mm" positionLock="true" background="false" itemRotation="0" zValue="7" marginX="1" groupUuid="" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="63" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="63" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32082,65 +31190,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.2" position="430.403,825.052,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" blendMode="0" htmlState="0" type="65641" size="56.6212,15.3656,mm" halign="2" valign="32" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="56.6212,15.3656,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" valign="32" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32155,65 +31263,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="372.175,808.942,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" blendMode="0" htmlState="0" type="65641" size="114.848,15.0635,mm" halign="2" valign="64" frame="false" zValue="4">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="114.848,15.0635,mm" positionLock="true" background="false" itemRotation="0" zValue="4" marginX="1" groupUuid="" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32228,39 +31336,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="489.557,775.395,mm" outlineWidthM="0.3,mm" pictureWidth="100.498" position="489.557,775.395,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="8" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" blendMode="0" type="65640" size="100.498,63.9757,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="3" pictureHeight="58.7992" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="100.498,63.9757,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="3" pictureWidth="100.498" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" mapUuid="" resizeMode="0" anchorPoint="8" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="58.7992" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="489.557,775.395,mm" mode="1" outlineWidthM="0.3,mm" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32268,42 +31376,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="481.428,0.606138,mm" frame="false" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="481.428,0.606138,mm" positionLock="true" background="false" itemRotation="0" zValue="2" groupUuid="" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32318,90 +31426,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Marshal overview" labelMargin="0,mm" mapFlags="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="3.94474,5.25965,mm" outlineWidthM="0.3,mm" position="3.94474,5.25965,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" blendMode="0" followPreset="true" type="65639" size="584.759,811.213,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="584.759,811.213,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Marshal overview" positionOnPage="3.94474,5.25965,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42299397558693741" ymin="-33.95821655848814657" xmin="18.37434415142052657" ymax="-33.89072661913806428"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="virtual" sortFeatures="1" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerName="complete_marshal_overview" sortKey="page"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" coverageLayerProvider="virtual" sortAscending="1" coverageLayerName="complete_marshal_overview" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" pageNameExpression="&quot;page&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" sortFeatures="1" sortKey="page" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="" name="Access Roads" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32416,49 +31524,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32473,27 +31581,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem blendMode="0" rasterBorder="1" wmsLegendWidth="50" wmsLegendHeight="25" fontColor="#000000" zValue="15" positionOnPage="244.484,130.172,mm" groupUuid="" columnCount="1" splitLayer="0" rasterBorderWidth="0" columnSpace="2" referencePoint="0" visibility="1" legendFilterByAtlas="0" minSymbolSize="0" maxSymbolSize="0" titleAlignment="1" outlineWidthM="0.3,mm" frameJoinStyle="miter" excludeFromExports="0" size="34.45,40.8,mm" itemRotation="0" resizeToContents="1" boxSpace="2" background="true" position="244.484,130.172,mm" wrapChar="" type="65642" positionLock="true" symbolHeight="4" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderColor="0,0,0,255" opacity="1" id="" lineSpacing="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" title="" symbolAlignment="1" symbolWidth="7" equalColumnWidth="0">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="185" red="255" blue="255"/>
+      <LayoutItem groupUuid="" type="65642" frameJoinStyle="miter" legendFilterByAtlas="0" symbolAlignment="1" splitLayer="0" id="" symbolHeight="4" minSymbolSize="0" titleAlignment="1" resizeToContents="1" rasterBorderWidth="0" visibility="1" symbolWidth="7" background="true" opacity="1" columnCount="1" frame="true" equalColumnWidth="0" boxSpace="2" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" positionOnPage="244.484,130.172,mm" wmsLegendWidth="50" referencePoint="0" maxSymbolSize="0" blendMode="0" outlineWidthM="0.3,mm" rasterBorderColor="0,0,0,255" rasterBorder="1" positionLock="true" size="34.45,40.8,mm" excludeFromExports="0" fontColor="#000000" columnSpace="2" itemRotation="0" lineSpacing="1" zValue="15" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" position="244.484,130.172,mm" title="" wrapChar="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="185" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32501,35 +31609,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="group" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="group" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0" marginTop="3">
-            <styleFont strikethrough="0" underline="0" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,63,0,0,0,0,0,Semibold" bold="1"/>
+          <style indent="0" marginTop="3" name="subgroup" alignment="1">
+            <styleFont italic="0" bold="1" style="Semibold" underline="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbol" indent="0" marginTop="2.5">
-            <styleFont strikethrough="0" underline="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
+            <styleFont italic="0" bold="0" style="" underline="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" indent="0" marginLeft="2" marginTop="2">
-            <styleFont strikethrough="0" underline="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" bold="0"/>
+          <style indent="0" marginTop="2" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont italic="0" bold="0" style="Regular" underline="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" groupLayer="" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" checked="Qt::Checked" name="residents_access_roads" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" providerKey="ogr" legend_exp="">
+            <layer-tree-layer checked="Qt::Checked" expanded="1" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option value="hidden" type="QString" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32537,47 +31645,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="0" positionLock="true" id="" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" labelText="ACCESS ROUTES FOR RESIDENTS" position="9.37446,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" blendMode="0" htmlState="0" type="65641" size="194.851,7.272,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="194.851,7.272,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="0" groupUuid="" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32592,65 +31700,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.1" position="204.225,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" blendMode="0" htmlState="0" type="65641" size="57.4836,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="57.4836,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32665,65 +31773,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32738,39 +31846,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32778,42 +31886,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.959,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.959,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="3" groupUuid="" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32828,61 +31936,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" position="5.86559,4.09761,mm" keepLayerSet="false" frameJoinStyle="miter" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" blendMode="0" followPreset="true" type="65639" size="67.7828,166.874,mm" frame="true" isTemporal="0" zValue="2">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="67.7828,166.874,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="2" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="miter" blendMode="0" followPresetName="Access Routes" positionOnPage="5.86559,4.09761,mm" isTemporal="0" outlineWidthM="0.3,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMax" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32897,45 +32005,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32966,44 +32074,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33026,40 +32134,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33074,29 +32182,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33104,45 +32212,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="Access Routes" labelMargin="0,mm" mapFlags="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" position="9.44946,9.08557,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" blendMode="0" followPreset="true" type="65639" size="282.012,175.592,mm" frame="true" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="282.012,175.592,mm" positionLock="true" background="true" drawCanvasItems="false" followPreset="true" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mapFlags="0" excludeFromExports="0" frame="true" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="Access Routes" positionOnPage="9.44946,9.08557,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" xmin="18.37000000000000099" ymax="-33.89697816224119009"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33157,45 +32265,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33226,44 +32334,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33286,40 +32394,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33334,29 +32442,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33364,56 +32472,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerProvider="ogr" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayerName="residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144" units="mm">
-      <Snapper snapToGrid="0" snapToGuides="1" tolerance="5" snapToItems="1"/>
-      <Grid offsetY="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0"/>
+    <Layout units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144">
+      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" resolution="10" offsetUnits="mm" offsetX="0" offsetY="0"/>
       <PageCollection>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="255,255,255,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="no" type="QString" name="outline_style"/>
+              <Option value="0.26" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33428,49 +32536,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem visibility="1" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" position="0,0,mm" frameJoinStyle="miter" excludeFromExports="0" background="true" referencePoint="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0" type="65638" size="297,210,mm" frame="false" zValue="0">
-          <FrameColor green="0" alpha="255" red="0" blue="0"/>
-          <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+        <LayoutItem referencePoint="0" size="297,210,mm" positionLock="false" background="true" itemRotation="0" zValue="0" groupUuid="" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0" frame="false" visibility="1" type="65638" opacity="1" frameJoinStyle="miter" blendMode="0" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="">
+          <FrameColor alpha="255" red="0" green="0" blue="0"/>
+          <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                <Option value="255,255,255,255" type="QString" name="color"/>
+                <Option value="miter" type="QString" name="joinstyle"/>
+                <Option value="0,0" type="QString" name="offset"/>
+                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                <Option value="MM" type="QString" name="offset_unit"/>
+                <Option value="35,35,35,255" type="QString" name="outline_color"/>
+                <Option value="no" type="QString" name="outline_style"/>
+                <Option value="0.26" type="QString" name="outline_width"/>
+                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option value="solid" type="QString" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33485,59 +32593,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" position="0" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem visibility="1" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="0" positionLock="true" id="" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" labelText="Access to P9 Parking and VIP Tent" position="9.37446,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" blendMode="0" htmlState="0" type="65641" size="194.851,7.272,mm" halign="1" valign="64" frame="false" zValue="8">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="194.851,7.272,mm" positionLock="true" background="false" itemRotation="0" zValue="8" marginX="0" groupUuid="" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="1" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="14" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="14" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33552,65 +32660,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" labelText="REVISION 1.0" position="204.225,191.81,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" blendMode="0" htmlState="0" type="65641" size="57.4836,6.8714,mm" halign="2" valign="64" frame="false" zValue="6">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="57.4836,6.8714,mm" positionLock="true" background="false" itemRotation="0" zValue="6" marginX="1" groupUuid="" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33625,65 +32733,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginY="1" opacity="1" itemRotation="0" groupUuid="" marginX="1" positionLock="true" id="" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" labelText="Sunday, 20 October 2019" position="210.038,199.082,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" blendMode="0" htmlState="0" type="65641" size="51.6706,6.60801,mm" halign="2" valign="64" frame="false" zValue="5">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" htmlState="0" size="51.6706,6.60801,mm" positionLock="true" background="false" itemRotation="0" zValue="5" marginX="1" groupUuid="" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0" frame="false" visibility="1" type="65641" opacity="1" halign="2" marginY="1" frameJoinStyle="miter" blendMode="0" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" valign="64" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="12" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+        <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="12" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-          <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-          <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+          <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+            <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                  <Option value="255,255,255,255" type="QString" name="color"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                  <Option value="no" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="solid" type="QString" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33698,39 +32806,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+          <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem visibility="1" svgBorderColor="0,0,0,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" svgFillColor="255,255,255,255" itemRotation="0" groupUuid="" northOffset="0" positionLock="true" id="" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" position="262.196,188.218,mm" pictureRotation="0" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" anchorPoint="4" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" blendMode="0" type="65640" size="29.7523,17.4718,mm" mode="1" northMode="0" frame="false" file="../Gun_Run_Logo.png" resizeMode="0" zValue="4" pictureHeight="17.4074" mapUuid="">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="29.7523,17.4718,mm" positionLock="true" background="false" svgBorderColor="0,0,0,255" itemRotation="0" zValue="4" pictureWidth="29.7523" pictureRotation="0" groupUuid="" svgFillColor="255,255,255,255" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" mapUuid="" resizeMode="0" anchorPoint="4" excludeFromExports="0" frame="false" visibility="1" type="65640" opacity="1" pictureHeight="17.4074" frameJoinStyle="miter" blendMode="0" northOffset="0" positionOnPage="262.196,188.218,mm" mode="1" outlineWidthM="0.3,mm" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" id="" file="../Gun_Run_Logo.png" northMode="0">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33738,42 +32846,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem visibility="1" shapeType="1" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" itemRotation="0" groupUuid="" positionLock="true" id="" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" frameJoinStyle="miter" excludeFromExports="0" background="false" referencePoint="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0" cornerRadiusMeasure="0,mm" type="65643" size="251.959,0.1,mm" frame="false" zValue="3">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="251.959,0.1,mm" positionLock="true" background="false" itemRotation="0" zValue="3" groupUuid="" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0" frame="false" visibility="1" type="65643" opacity="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" blendMode="0" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" shapeType="1" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" name="" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+        <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option value="" type="QString" name="name"/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+              <Option value="0,0,0,255" type="QString" name="color"/>
+              <Option value="miter" type="QString" name="joinstyle"/>
+              <Option value="0,0" type="QString" name="offset"/>
+              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+              <Option value="MM" type="QString" name="offset_unit"/>
+              <Option value="0,0,0,255" type="QString" name="outline_color"/>
+              <Option value="solid" type="QString" name="outline_style"/>
+              <Option value="0.3" type="QString" name="outline_width"/>
+              <Option value="MM" type="QString" name="outline_width_unit"/>
+              <Option value="solid" type="QString" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33788,46 +32896,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" visibility="1" followPresetName="" labelMargin="0,mm" mapFlags="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" itemRotation="0" groupUuid="" positionLock="false" id="" positionOnPage="9.44946,7.25098,mm" outlineWidthM="0.15,mm" position="9.44946,7.25098,mm" keepLayerSet="false" frameJoinStyle="round" excludeFromExports="0" background="true" mapRotation="0" referencePoint="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" blendMode="0" followPreset="false" type="65639" size="282.012,182.649,mm" frame="false" isTemporal="0" zValue="1">
-        <FrameColor green="0" alpha="255" red="0" blue="0"/>
-        <BackgroundColor green="255" alpha="255" red="255" blue="255"/>
+      <LayoutItem referencePoint="0" size="282.012,182.649,mm" positionLock="false" background="true" drawCanvasItems="false" followPreset="false" mapRotation="0" itemRotation="0" zValue="1" groupUuid="" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" mapFlags="0" excludeFromExports="0" frame="false" visibility="1" type="65639" opacity="1" labelMargin="0,mm" frameJoinStyle="round" blendMode="0" followPresetName="" positionOnPage="9.44946,7.25098,mm" isTemporal="0" outlineWidthM="0.15,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" keepLayerSet="false" id="">
+        <FrameColor alpha="255" red="0" green="0" blue="0"/>
+        <BackgroundColor alpha="255" red="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option value="" type="QString" 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>
-                <Option name="dataDefinedMapXMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" 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"/>
-                  <Option name="type" type="int" value="3"/>
+                <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>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option value="collection" type="QString" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40919746780259914" ymin="-33.90848231674397084" xmin="18.40103928699269886" ymax="-33.90319854486631357"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33842,45 +32950,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid blendMode="0" offsetX="0" unit="0" topAnnotationDisplay="0" topAnnotationDirection="0" frameFillColor1="255,255,255,255" rightAnnotationDirection="0" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" topAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" rightAnnotationDisplay="0" annotationPrecision="3" maximumIntervalWidth="100" crossLength="3" bottomAnnotationDisplay="0" topFrameDivisions="0" gridFrameSideFlags="15" rotatedAnnotationsEnabled="0" annotationExpression="" minimumIntervalWidth="50" leftAnnotationDirection="0" rotatedTicksEnabled="0" gridFrameMargin="0" leftFrameDivisions="0" gridFramePenColor="0,0,0,255" position="3" offsetY="0" rotatedTicksLengthMode="0" bottomFrameDivisions="0" intervalX="0" gridFrameStyle="0" rightFrameDivisions="0" gridStyle="0" bottomAnnotationDirection="0" annotationFormat="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" leftAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" show="0" gridFrameWidth="2" gridFramePenThickness="0.5" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" intervalY="0" showAnnotation="0" rotatedTicksMarginToCorner="0" name="Grid 1">
+        <ComposerMapGrid showAnnotation="0" gridFramePenColor="0,0,0,255" leftAnnotationDisplay="0" minimumIntervalWidth="50" annotationPrecision="3" topAnnotationDirection="0" crossLength="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" leftAnnotationDirection="0" frameAnnotationDistance="1" gridFrameWidth="2" rotatedTicksMinimumAngle="0" gridFrameMargin="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" annotationExpression="" rotatedTicksEnabled="0" annotationFormat="0" topAnnotationPosition="1" topAnnotationDisplay="0" offsetY="0" bottomAnnotationDirection="0" leftFrameDivisions="0" rightAnnotationDirection="0" blendMode="0" rotatedAnnotationsMinimumAngle="0" unit="0" rightFrameDivisions="0" rightAnnotationPosition="1" frameFillColor1="255,255,255,255" maximumIntervalWidth="100" frameFillColor2="0,0,0,255" topFrameDivisions="0" rotatedAnnotationsMarginToCorner="0" bottomAnnotationPosition="1" intervalY="0" gridStyle="0" offsetX="0" name="Grid 1" rightAnnotationDisplay="0" show="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" intervalX="0" position="3" gridFramePenThickness="0.5" gridFrameStyle="0">
           <lineStyle>
-            <symbol is_animated="0" name="" type="line" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option value="0" type="QString" name="align_dash_pattern"/>
+                  <Option value="square" type="QString" name="capstyle"/>
+                  <Option value="5;2" type="QString" name="customdash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="customdash_unit"/>
+                  <Option value="0" type="QString" name="dash_pattern_offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
+                  <Option value="0" type="QString" name="draw_inside_polygon"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="0,0,0,255" type="QString" name="line_color"/>
+                  <Option value="solid" type="QString" name="line_style"/>
+                  <Option value="0" type="QString" name="line_width"/>
+                  <Option value="MM" type="QString" name="line_width_unit"/>
+                  <Option value="0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0" type="QString" name="ring_filter"/>
+                  <Option value="0" type="QString" name="trim_distance_end"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
+                  <Option value="0" type="QString" name="trim_distance_start"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
+                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
+                  <Option value="0" type="QString" name="use_custom_dash"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33911,44 +33019,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 name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" name="" type="marker" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <symbol force_rhr="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option value="" type="QString" name="name"/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option value="collection" type="QString" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option value="0" type="QString" name="angle"/>
+                  <Option value="square" type="QString" name="cap_style"/>
+                  <Option value="0,0,0,255" type="QString" name="color"/>
+                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
+                  <Option value="bevel" type="QString" name="joinstyle"/>
+                  <Option value="circle" type="QString" name="name"/>
+                  <Option value="0,0" type="QString" name="offset"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="offset_unit"/>
+                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
+                  <Option value="solid" type="QString" name="outline_style"/>
+                  <Option value="0" type="QString" name="outline_width"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="outline_width_unit"/>
+                  <Option value="diameter" type="QString" name="scale_method"/>
+                  <Option value="2" type="QString" name="size"/>
+                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+                  <Option value="MM" type="QString" name="size_unit"/>
+                  <Option value="1" type="QString" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33971,40 +33079,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" multilineHeight="1" fontFamily="Myriad Pro" textColor="0,0,0,255" textOpacity="1" fontUnderline="0" fontSizeUnit="Point" fontStrikeout="0" fontLetterSpacing="0" fontSize="10" fontWordSpacing="0" fontKerning="1" capitalization="0" namedStyle="" forcedBold="0" previewBkgrdColor="255,255,255,255" blendMode="0" allowHtml="0" fontWeight="50" forcedItalic="0" fontItalic="0">
+          <text-style fontUnderline="0" fontStrikeout="0" allowHtml="0" fontSizeUnit="Point" fontLetterSpacing="0" fontWeight="50" multilineHeight="1" forcedItalic="0" fontItalic="0" forcedBold="0" fontFamily="Myriad Pro" fontWordSpacing="0" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" previewBkgrdColor="255,255,255,255" blendMode="0" namedStyle="" fontSize="10" fontKerning="1" textColor="0,0,0,255" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferSize="1" bufferDraw="0" bufferJoinStyle="128" bufferNoFill="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferBlendMode="0"/>
-            <text-mask maskJoinStyle="128" maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSizeUnits="MM" maskSize="1.5" maskedSymbolLayers="" maskOpacity="1" maskType="0"/>
-            <background shapeRotationType="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRadiiY="0" shapeSizeX="0" shapeSizeY="0" shapeOffsetX="0" shapeRadiiUnit="MM" shapeSizeUnit="MM" shapeRotation="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeDraw="0" shapeSizeType="0" shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" name="fillSymbol" type="fill" alpha="1" frame_rate="10" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferOpacity="1" bufferDraw="0" bufferColor="255,255,255,255" bufferBlendMode="0" bufferJoinStyle="128" bufferSize="1" bufferNoFill="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers="" maskSizeUnits="MM"/>
+            <background shapeSizeType="0" shapeRadiiUnit="MM" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeSizeX="0" shapeOpacity="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeSVGFile="" shapeSizeY="0" shapeOffsetY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeDraw="0" shapeBlendMode="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRadiiY="0">
+              <symbol force_rhr="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" is_animated="0" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option value="" type="QString" name="name"/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option value="collection" type="QString" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
+                    <Option value="255,255,255,255" type="QString" name="color"/>
+                    <Option value="bevel" type="QString" name="joinstyle"/>
+                    <Option value="0,0" type="QString" name="offset"/>
+                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+                    <Option value="MM" type="QString" name="offset_unit"/>
+                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
+                    <Option value="no" type="QString" name="outline_style"/>
+                    <Option value="0" type="QString" name="outline_width"/>
+                    <Option value="MM" type="QString" name="outline_width_unit"/>
+                    <Option value="solid" type="QString" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34019,29 +33127,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option value="" type="QString" name="name"/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option value="collection" type="QString" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowScale="100" shadowUnder="0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowColor="0,0,0,255"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowColor="0,0,0,255" shadowUnder="0" shadowDraw="0" shadowOffsetUnit="MM" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowScale="100" shadowOffsetDist="1" shadowBlendMode="6"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option value="" type="QString" name="name"/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option value="collection" type="QString" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34049,37 +33157,37 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap scalingMode="2" atlasDriven="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" restrictLayers="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clipSource="" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option value="png" type="QString" name="atlasRasterFormat"/>
+          <Option value="0" type="QString" name="forceVector"/>
+          <Option value="true" type="QString" name="imageAntialias"/>
+          <Option value="0" type="QString" name="imageCropMarginBottom"/>
+          <Option value="0" type="QString" name="imageCropMarginLeft"/>
+          <Option value="0" type="QString" name="imageCropMarginRight"/>
+          <Option value="0" type="QString" name="imageCropMarginTop"/>
+          <Option value="false" type="QString" name="imageCropToContents"/>
+          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
+          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
+          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option value="false" type="QString" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" filterFeatures="0" enabled="0" coverageLayerProvider="ogr" sortFeatures="0" pageNameExpression="&quot;FID&quot;" 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" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" coverageLayerName="residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" sortFeatures="0" filterFeatures="0" enabled="0"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.4549366430076951" ymin="-33.92778655896992035" xmin="18.37381723755126117" ymax="-33.88415099189598578">
+    <DefaultViewExtent ymax="-33.93930163110317011" xmin="18.41060297945224278" xmax="18.4303271391347252" ymin="-33.94991160645935935">
       <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>
@@ -34093,41 +33201,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///RamFCc_styles.db" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0"/>
+  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStep="1" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option name="decimal_separator" type="QChar" value=""/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="direction_format" type="int" value="0"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="QChar" value=""/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="direction_format"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
-        <Option name="decimal_separator" type="QChar" value=""/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
-        <Option name="show_leading_zeros" type="bool" value="false"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_suffix" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="QChar" value=""/>
+        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
+        <Option value="" type="QChar" name="decimal_separator"/>
+        <Option value="6" type="int" name="decimals"/>
+        <Option value="0" type="int" name="rounding_type"/>
+        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
+        <Option value="false" type="bool" name="show_leading_zeros"/>
+        <Option value="false" type="bool" name="show_plus"/>
+        <Option value="false" type="bool" name="show_suffix"/>
+        <Option value="true" type="bool" name="show_thousand_separator"/>
+        <Option value="false" type="bool" name="show_trailing_zeros"/>
+        <Option value="" type="QChar" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index a1f5308..8bb4960 100644
Binary files a/GIS Base Map/all_routes.dbf and b/GIS Base Map/all_routes.dbf differ
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index 2337ef9..d0f8643 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index a6a4cd9..95e219c 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ
diff --git a/README.md b/README.md
index 80b7fe5..6ca4c47 100644
--- a/README.md
+++ b/README.md
@@ -84,21 +84,21 @@ if (
 To place the route markers on the appropriate side of the route, use something like the following in the field calculator to create a new text field named `quadrant` (used by the label's position priority in the placement section):
 ```
 CASE 
-WHEN "RouteLen" = '21' THEN
+WHEN "Source" = '21KM' THEN
 	CASE 
 		WHEN regexp_match( "Name", '^([136]|20|1[45678])$') THEN 'L,TL'
 		WHEN regexp_match( "Name", '^([489]|10|1[123])$') THEN 'R,BR'
 		WHEN regexp_match( "Name", '^([25]|19)$') THEN 'T'
 		WHEN regexp_match( "Name", '^([7])$') THEN 'B'
 	END
-WHEN "RouteLen" = '10' THEN
+WHEN "Source" = '10KM' THEN
 	CASE 
 		WHEN regexp_match( "Name", '^[789]$') THEN 'L,TL'
 		WHEN regexp_match( "Name", '^[2456]$') THEN 'R,BR'
 		WHEN regexp_match( "Name", '^[1]$') THEN 'T'
 		WHEN regexp_match( "Name", '^[3]$') THEN 'B'
 	END
-WHEN "RouteLen" = '5' THEN
+WHEN "Source" = '5KM' THEN
 	CASE 
 		WHEN regexp_match( "Name", '^[12]$') THEN 'L,TL'
 		WHEN regexp_match( "Name", '^[0]$') THEN 'R,BR'
@@ -106,6 +106,14 @@ WHEN "RouteLen" = '5' THEN
 		WHEN regexp_match( "Name", '^[3]$') THEN 'B'
 
 	END
+WHEN "Source" = 'Trail' THEN
+	CASE 
+		WHEN regexp_match( "Name", '^14$') THEN 'L,TL'
+		WHEN regexp_match( "Name", '^8$') THEN 'L,BL'
+		WHEN regexp_match( "Name", '^9$') THEN 'R,TR'
+		WHEN regexp_match( "Name", '^Finish$') THEN 'R,BR'
+		WHEN regexp_match( "Name", '^Start$') THEN 'R,TR'
+	END
 END
 ```
 (Note that you may wish to allocate particular markers different positional quadrant; edit the above as needed.)